[s3c24xx] bump to 2.6.30-rc6
[openwrt/svn-archive/archive.git] / target / linux / s3c24xx / patches-2.6.30 / 053-glamo.patch
1 Index: linux-2.6.30-rc6/drivers/mfd/Kconfig
2 ===================================================================
3 --- linux-2.6.30-rc6.orig/drivers/mfd/Kconfig 2009-05-16 06:12:57.000000000 +0200
4 +++ linux-2.6.30-rc6/drivers/mfd/Kconfig 2009-05-18 19:08:32.000000000 +0200
5 @@ -241,6 +241,8 @@
6 Say yes here if you want to include support GPIO for pins on
7 the PCF50633 chip.
8
9 +source "drivers/mfd/glamo/Kconfig"
10 +
11 endmenu
12
13 menu "Multimedia Capabilities Port drivers"
14 Index: linux-2.6.30-rc6/drivers/mfd/Makefile
15 ===================================================================
16 --- linux-2.6.30-rc6.orig/drivers/mfd/Makefile 2009-05-16 06:12:57.000000000 +0200
17 +++ linux-2.6.30-rc6/drivers/mfd/Makefile 2009-05-18 19:08:32.000000000 +0200
18 @@ -4,6 +4,7 @@
19
20 obj-$(CONFIG_MFD_SM501) += sm501.o
21 obj-$(CONFIG_MFD_ASIC3) += asic3.o
22 +obj-$(CONFIG_MFD_GLAMO) += glamo/
23
24 obj-$(CONFIG_HTC_EGPIO) += htc-egpio.o
25 obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o
26 Index: linux-2.6.30-rc6/include/linux/fb.h
27 ===================================================================
28 --- linux-2.6.30-rc6.orig/include/linux/fb.h 2009-05-16 06:12:57.000000000 +0200
29 +++ linux-2.6.30-rc6/include/linux/fb.h 2009-05-18 19:08:32.000000000 +0200
30 @@ -124,6 +124,7 @@
31 #define FB_ACCEL_TRIDENT_BLADE3D 52 /* Trident Blade3D */
32 #define FB_ACCEL_TRIDENT_BLADEXP 53 /* Trident BladeXP */
33 #define FB_ACCEL_CIRRUS_ALPINE 53 /* Cirrus Logic 543x/544x/5480 */
34 +#define FB_ACCEL_GLAMO 50 /* SMedia Glamo */
35 #define FB_ACCEL_NEOMAGIC_NM2070 90 /* NeoMagic NM2070 */
36 #define FB_ACCEL_NEOMAGIC_NM2090 91 /* NeoMagic NM2090 */
37 #define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */