aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/s3c24xx/patches-2.6.30/014-neo1973_mach.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-05-25 12:27:13 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-05-25 12:27:13 +0000
commit04bca7b528c9697d604c4ab88464b9604fe84be3 (patch)
treee33328c39e19ce04867c4a6815b42e41fde9b382 /target/linux/s3c24xx/patches-2.6.30/014-neo1973_mach.patch
parentcd649df858be5066ae06a73647f6578421e541f7 (diff)
downloadupstream-04bca7b528c9697d604c4ab88464b9604fe84be3.tar.gz
upstream-04bca7b528c9697d604c4ab88464b9604fe84be3.tar.bz2
upstream-04bca7b528c9697d604c4ab88464b9604fe84be3.zip
update to 2.6.30-rc7
SVN-Revision: 16048
Diffstat (limited to 'target/linux/s3c24xx/patches-2.6.30/014-neo1973_mach.patch')
-rw-r--r--target/linux/s3c24xx/patches-2.6.30/014-neo1973_mach.patch24
1 files changed, 9 insertions, 15 deletions
diff --git a/target/linux/s3c24xx/patches-2.6.30/014-neo1973_mach.patch b/target/linux/s3c24xx/patches-2.6.30/014-neo1973_mach.patch
index af93ee2ab6..5513f980cd 100644
--- a/target/linux/s3c24xx/patches-2.6.30/014-neo1973_mach.patch
+++ b/target/linux/s3c24xx/patches-2.6.30/014-neo1973_mach.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.30-rc6/arch/arm/plat-s3c24xx/Kconfig
-===================================================================
---- linux-2.6.30-rc6.orig/arch/arm/plat-s3c24xx/Kconfig 2009-05-18 19:08:29.000000000 +0200
-+++ linux-2.6.30-rc6/arch/arm/plat-s3c24xx/Kconfig 2009-05-18 19:08:31.000000000 +0200
-@@ -112,4 +112,20 @@
+--- a/arch/arm/plat-s3c24xx/Kconfig
++++ b/arch/arm/plat-s3c24xx/Kconfig
+@@ -112,4 +112,20 @@ config MACH_SMDK
help
Common machine code for SMDK2410 and SMDK2440
@@ -23,11 +21,9 @@ Index: linux-2.6.30-rc6/arch/arm/plat-s3c24xx/Kconfig
+ Common machine code for Neo1973 hardware
+
endif
-Index: linux-2.6.30-rc6/arch/arm/mach-s3c2442/Makefile
-===================================================================
---- linux-2.6.30-rc6.orig/arch/arm/mach-s3c2442/Makefile 2009-05-16 06:12:57.000000000 +0200
-+++ linux-2.6.30-rc6/arch/arm/mach-s3c2442/Makefile 2009-05-18 19:08:31.000000000 +0200
-@@ -14,3 +14,9 @@
+--- a/arch/arm/mach-s3c2442/Makefile
++++ b/arch/arm/mach-s3c2442/Makefile
+@@ -14,3 +14,9 @@ obj-$(CONFIG_CPU_S3C2442) += clock.o
# Machine support
@@ -37,11 +33,9 @@ Index: linux-2.6.30-rc6/arch/arm/mach-s3c2442/Makefile
+ gta02-pm-bt.o \
+ gta02-pm-wlan.o \
+ gta02-shadow.o
-Index: linux-2.6.30-rc6/drivers/misc/Makefile
-===================================================================
---- linux-2.6.30-rc6.orig/drivers/misc/Makefile 2009-05-16 06:12:57.000000000 +0200
-+++ linux-2.6.30-rc6/drivers/misc/Makefile 2009-05-18 19:08:31.000000000 +0200
-@@ -21,3 +21,6 @@
+--- a/drivers/misc/Makefile
++++ b/drivers/misc/Makefile
+@@ -21,3 +21,6 @@ obj-$(CONFIG_HP_ILO) += hpilo.o
obj-$(CONFIG_ISL29003) += isl29003.o
obj-$(CONFIG_C2PORT) += c2port/
obj-y += eeprom/