diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-09-07 10:11:42 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-09-07 10:11:42 +0000 |
| commit | 1466cacb917668578f25aa2144425e2a1558e93a (patch) | |
| tree | 1a347006decd902a7efea0c4017d28f80096c01b /packages/linux/linux-ezx-2.6.21/patches/a1200-mci.patch | |
| parent | c9658e7ea05d70c94d626c1ec5f41bc029ed92b5 (diff) | |
| parent | a8543e0eb9b23051fb42d4f67928bcb1245becbf (diff) | |
merge of '824a2834a0da85846fd46c99800d62eb14ebe522'
and '93d42c42fbac9beca66c0c236f2fb48801155c94'
Diffstat (limited to 'packages/linux/linux-ezx-2.6.21/patches/a1200-mci.patch')
| -rwxr-xr-x | packages/linux/linux-ezx-2.6.21/patches/a1200-mci.patch | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/packages/linux/linux-ezx-2.6.21/patches/a1200-mci.patch b/packages/linux/linux-ezx-2.6.21/patches/a1200-mci.patch index 0d2640a2e7..0bd7581965 100755 --- a/packages/linux/linux-ezx-2.6.21/patches/a1200-mci.patch +++ b/packages/linux/linux-ezx-2.6.21/patches/a1200-mci.patch @@ -1,20 +1,8 @@ -Index: linux-2.6.21/arch/arm/mach-pxa/Kconfig -=================================================================== ---- linux-2.6.21.orig/arch/arm/mach-pxa/Kconfig 2007-06-02 20:32:31.000000000 -0300 -+++ linux-2.6.21/arch/arm/mach-pxa/Kconfig 2007-06-02 20:44:29.000000000 -0300 -@@ -97,6 +97,7 @@ - config PXA_EZX_A1200 - bool "Motorola A1200 GSM Phone" - select PXA27x -+ select EZX_MCI_TF - - config PXA_EZX_E6 - bool "Motorola E6 GSM Phone" Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c =================================================================== ---- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c 2007-06-02 20:32:26.000000000 -0300 -+++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c 2007-06-02 20:44:56.000000000 -0300 -@@ -13,11 +13,14 @@ +--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c 2007-06-28 22:48:05.000000000 -0300 ++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c 2007-06-28 22:53:19.000000000 -0300 +@@ -13,6 +13,8 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/fb.h> @@ -23,13 +11,14 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c #include <asm/mach-types.h> #include <asm/mach/arch.h> - #include <asm/arch/pxa-regs.h> +@@ -20,12 +22,102 @@ #include <asm/arch/pxafb.h> + #include <asm/arch/ezx.h> + #include <asm/arch/ezx-pcap.h> +#include <asm/arch/mmc.h> #include "generic.h" - #include "ezx.h" -@@ -25,6 +28,95 @@ + extern void ezx_lcd_power(int, struct fb_var_screeninfo *); extern void ezx_backlight_power(int); @@ -125,7 +114,7 @@ Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c static struct pxafb_mode_info mode_a1200 = { .pixclock = 192308, .xres = 240, -@@ -54,6 +146,7 @@ +@@ -88,6 +180,7 @@ static void __init a1200_init(void) { set_pxa_fb_info(&a1200_fb_info); |