diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2009-05-25 12:27:13 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2009-05-25 12:27:13 +0000 |
| commit | 04bca7b528c9697d604c4ab88464b9604fe84be3 (patch) | |
| tree | e33328c39e19ce04867c4a6815b42e41fde9b382 /target/linux/s3c24xx/patches-2.6.30/053-glamo.patch | |
| parent | cd649df858be5066ae06a73647f6578421e541f7 (diff) | |
| download | upstream-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/053-glamo.patch')
| -rw-r--r-- | target/linux/s3c24xx/patches-2.6.30/053-glamo.patch | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/target/linux/s3c24xx/patches-2.6.30/053-glamo.patch b/target/linux/s3c24xx/patches-2.6.30/053-glamo.patch index d0a78d5479..eb6800cbc8 100644 --- a/target/linux/s3c24xx/patches-2.6.30/053-glamo.patch +++ b/target/linux/s3c24xx/patches-2.6.30/053-glamo.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.30-rc6/drivers/mfd/Kconfig -=================================================================== ---- linux-2.6.30-rc6.orig/drivers/mfd/Kconfig 2009-05-16 06:12:57.000000000 +0200 -+++ linux-2.6.30-rc6/drivers/mfd/Kconfig 2009-05-18 19:08:32.000000000 +0200 -@@ -241,6 +241,8 @@ +--- a/drivers/mfd/Kconfig ++++ b/drivers/mfd/Kconfig +@@ -241,6 +241,8 @@ config PCF50633_GPIO Say yes here if you want to include support GPIO for pins on the PCF50633 chip. @@ -11,10 +9,8 @@ Index: linux-2.6.30-rc6/drivers/mfd/Kconfig endmenu menu "Multimedia Capabilities Port drivers" -Index: linux-2.6.30-rc6/drivers/mfd/Makefile -=================================================================== ---- linux-2.6.30-rc6.orig/drivers/mfd/Makefile 2009-05-16 06:12:57.000000000 +0200 -+++ linux-2.6.30-rc6/drivers/mfd/Makefile 2009-05-18 19:08:32.000000000 +0200 +--- a/drivers/mfd/Makefile ++++ b/drivers/mfd/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_MFD_SM501) += sm501.o @@ -23,11 +19,9 @@ Index: linux-2.6.30-rc6/drivers/mfd/Makefile obj-$(CONFIG_HTC_EGPIO) += htc-egpio.o obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o -Index: linux-2.6.30-rc6/include/linux/fb.h -=================================================================== ---- linux-2.6.30-rc6.orig/include/linux/fb.h 2009-05-16 06:12:57.000000000 +0200 -+++ linux-2.6.30-rc6/include/linux/fb.h 2009-05-18 19:08:32.000000000 +0200 -@@ -124,6 +124,7 @@ +--- a/include/linux/fb.h ++++ b/include/linux/fb.h +@@ -124,6 +124,7 @@ struct dentry; #define FB_ACCEL_TRIDENT_BLADE3D 52 /* Trident Blade3D */ #define FB_ACCEL_TRIDENT_BLADEXP 53 /* Trident BladeXP */ #define FB_ACCEL_CIRRUS_ALPINE 53 /* Cirrus Logic 543x/544x/5480 */ |