r3571 - branches/src/target/kernel/2.6.24.x/patches

laforge at sita.openmoko.org laforge at sita.openmoko.org
Wed Dec 5 07:57:35 CET 2007


Author: laforge
Date: 2007-12-05 07:57:15 +0100 (Wed, 05 Dec 2007)
New Revision: 3571

Modified:
   branches/src/target/kernel/2.6.24.x/patches/gta01-power_control.patch
   branches/src/target/kernel/2.6.24.x/patches/gta01-vibrator.patch
   branches/src/target/kernel/2.6.24.x/patches/input-nots-mousedev.patch
   branches/src/target/kernel/2.6.24.x/patches/pm-debug_less_verbose.patch
   branches/src/target/kernel/2.6.24.x/patches/s3c2410_touchscreen.patch
   branches/src/target/kernel/2.6.24.x/patches/s3c_mci.patch
Log:
merge patches with 2.6.24-rc4 mainline, mostly kconfig and other minor
syntactical patch hunk changes


Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-power_control.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-power_control.patch	2007-12-05 06:51:58 UTC (rev 3570)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-power_control.patch	2007-12-05 06:57:15 UTC (rev 3571)
@@ -1,16 +1,16 @@
-Index: linux-2.6.21.3-moko/arch/arm/common/Makefile
+Index: linux-2.6/arch/arm/common/Makefile
 ===================================================================
---- linux-2.6.21.3-moko.orig/arch/arm/common/Makefile
-+++ linux-2.6.21.3-moko/arch/arm/common/Makefile
-@@ -17,3 +17,4 @@
- obj-$(CONFIG_SHARP_SCOOP)	+= scoop.o
+--- linux-2.6.orig/arch/arm/common/Makefile
++++ linux-2.6/arch/arm/common/Makefile
+@@ -18,3 +18,4 @@
  obj-$(CONFIG_ARCH_IXP2000)	+= uengine.o
  obj-$(CONFIG_ARCH_IXP23XX)	+= uengine.o
+ obj-$(CONFIG_PCI_HOST_ITE8152)  += it8152.o
 +obj-$(CONFIG_MACH_NEO1973_GTA01)+= gta01_pm_gsm.o gta01_pm_gps.o gta01_pm_bt.o
-Index: linux-2.6.21.3-moko/arch/arm/common/gta01_pm_gps.c
+Index: linux-2.6/arch/arm/common/gta01_pm_gps.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.21.3-moko/arch/arm/common/gta01_pm_gps.c
++++ linux-2.6/arch/arm/common/gta01_pm_gps.c
 @@ -0,0 +1,558 @@
 +/*
 + * GPS Power Management code for the FIC Neo1973 GSM Phone
@@ -570,10 +570,10 @@
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Harald Welte <laforge at openmoko.org>");
 +MODULE_DESCRIPTION("FIC GTA01 (Neo1973) GPS Power Management");
-Index: linux-2.6.21.3-moko/arch/arm/common/gta01_pm_gsm.c
+Index: linux-2.6/arch/arm/common/gta01_pm_gsm.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.21.3-moko/arch/arm/common/gta01_pm_gsm.c
++++ linux-2.6/arch/arm/common/gta01_pm_gsm.c
 @@ -0,0 +1,217 @@
 +/*
 + * GSM Management code for the FIC Neo1973 GSM Phone
@@ -792,10 +792,10 @@
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Harald Welte <laforge at openmoko.org>");
 +MODULE_DESCRIPTION("FIC GTA01 (Neo1973) GSM Management");
-Index: linux-2.6.21.3-moko/arch/arm/common/gta01_pm_bt.c
+Index: linux-2.6/arch/arm/common/gta01_pm_bt.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.21.3-moko/arch/arm/common/gta01_pm_bt.c
++++ linux-2.6/arch/arm/common/gta01_pm_bt.c
 @@ -0,0 +1,154 @@
 +/*
 + * Bluetooth PM code for the FIC Neo1973 GSM Phone

Modified: branches/src/target/kernel/2.6.24.x/patches/gta01-vibrator.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/gta01-vibrator.patch	2007-12-05 06:51:58 UTC (rev 3570)
+++ branches/src/target/kernel/2.6.24.x/patches/gta01-vibrator.patch	2007-12-05 06:57:15 UTC (rev 3571)
@@ -2,10 +2,10 @@
 uses the existing LED class driver framework, since there's a lot of
 similarity between the LED and the vibrator function.
 
-Index: linux-2.6.23/drivers/leds/leds-gta01.c
+Index: linux-2.6/drivers/leds/leds-gta01.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.23/drivers/leds/leds-gta01.c
++++ linux-2.6/drivers/leds/leds-gta01.c
 @@ -0,0 +1,177 @@
 +/*
 + * LED driver for the FIC GTA01 (Neo1973) GSM Phone Vibrator
@@ -184,10 +184,10 @@
 +
 +MODULE_AUTHOR("Harald Welte <laforge at openmoko.org>");
 +MODULE_DESCRIPTION("FIC GTA01 Vibrator driver");
-Index: linux-2.6.23/drivers/leds/Kconfig
+Index: linux-2.6/drivers/leds/Kconfig
 ===================================================================
---- linux-2.6.23.orig/drivers/leds/Kconfig
-+++ linux-2.6.23/drivers/leds/Kconfig
+--- linux-2.6.orig/drivers/leds/Kconfig
++++ linux-2.6/drivers/leds/Kconfig
 @@ -57,7 +57,7 @@
  
  config LEDS_S3C24XX
@@ -197,9 +197,9 @@
  	help
  	  This option enables support for LEDs connected to GPIO lines
  	  on Samsung S3C24XX series CPUs, such as the S3C2410 and S3C2440.
-@@ -101,6 +101,12 @@
- 	  outputs. To be useful the particular board must have LEDs
- 	  and they must be connected to the GPIO lines.
+@@ -114,6 +114,12 @@
+ 	help
+ 	  This option enables support for the CM-X270 LEDs.
  
 +config LEDS_GTA01
 +	tristate "Vibrator Support for the FIC Neo1973 (GTA01) Vibrator"
@@ -210,14 +210,14 @@
  comment "LED Triggers"
  
  config LEDS_TRIGGERS
-Index: linux-2.6.23/drivers/leds/Makefile
+Index: linux-2.6/drivers/leds/Makefile
 ===================================================================
---- linux-2.6.23.orig/drivers/leds/Makefile
-+++ linux-2.6.23/drivers/leds/Makefile
-@@ -17,6 +17,7 @@
- obj-$(CONFIG_LEDS_H1940)		+= leds-h1940.o
- obj-$(CONFIG_LEDS_COBALT)		+= leds-cobalt.o
+--- linux-2.6.orig/drivers/leds/Makefile
++++ linux-2.6/drivers/leds/Makefile
+@@ -19,6 +19,7 @@
+ obj-$(CONFIG_LEDS_COBALT_RAQ)		+= leds-cobalt-raq.o
  obj-$(CONFIG_LEDS_GPIO)			+= leds-gpio.o
+ obj-$(CONFIG_LEDS_CM_X270)              += leds-cm-x270.o
 +obj-$(CONFIG_LEDS_GTA01)		+= leds-gta01.o
  
  # LED Triggers

Modified: branches/src/target/kernel/2.6.24.x/patches/input-nots-mousedev.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/input-nots-mousedev.patch	2007-12-05 06:51:58 UTC (rev 3570)
+++ branches/src/target/kernel/2.6.24.x/patches/input-nots-mousedev.patch	2007-12-05 06:57:15 UTC (rev 3571)
@@ -5,22 +5,23 @@
 
 Signed-off-by: Harald Welte <laforge at openmoko.org>
 
-Index: linux-2.6.17.14-fic4.test/drivers/input/mousedev.c
+Index: linux-2.6/drivers/input/mousedev.c
 ===================================================================
---- linux-2.6.17.14-fic4.test.orig/drivers/input/mousedev.c	2007-02-09 13:47:15.000000000 +0100
-+++ linux-2.6.17.14-fic4.test/drivers/input/mousedev.c	2007-02-09 13:47:40.000000000 +0100
-@@ -689,12 +689,14 @@
- 		.evbit = { BIT(EV_KEY) | BIT(EV_REL) },
- 		.relbit = { BIT(REL_WHEEL) },
+--- linux-2.6.orig/drivers/input/mousedev.c
++++ linux-2.6/drivers/input/mousedev.c
+@@ -1009,6 +1009,7 @@
+ 		.evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_REL) },
+ 		.relbit = { BIT_MASK(REL_WHEEL) },
  	},	/* A separate scrollwheel */
 +#if 0
  	{
- 		.flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT | INPUT_DEVICE_ID_MATCH_ABSBIT,
- 		.evbit = { BIT(EV_KEY) | BIT(EV_ABS) },
- 		.keybit = { [LONG(BTN_TOUCH)] = BIT(BTN_TOUCH) },
- 		.absbit = { BIT(ABS_X) | BIT(ABS_Y) },
- 	},	/* A tablet like device, at least touch detection, two absolute axes */
+ 		.flags = INPUT_DEVICE_ID_MATCH_EVBIT |
+ 				INPUT_DEVICE_ID_MATCH_KEYBIT |
+@@ -1018,6 +1019,7 @@
+ 		.absbit = { BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) },
+ 	},	/* A tablet like device, at least touch detection,
+ 		   two absolute axes */
 +#endif
  	{
- 		.flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT | INPUT_DEVICE_ID_MATCH_ABSBIT,
- 		.evbit = { BIT(EV_KEY) | BIT(EV_ABS) },
+ 		.flags = INPUT_DEVICE_ID_MATCH_EVBIT |
+ 				INPUT_DEVICE_ID_MATCH_KEYBIT |

Modified: branches/src/target/kernel/2.6.24.x/patches/pm-debug_less_verbose.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/pm-debug_less_verbose.patch	2007-12-05 06:51:58 UTC (rev 3570)
+++ branches/src/target/kernel/2.6.24.x/patches/pm-debug_less_verbose.patch	2007-12-05 06:57:15 UTC (rev 3571)
@@ -1,16 +1,16 @@
-Index: linux-2.6.23-rc8/drivers/base/power/main.c
+Index: linux-2.6/drivers/base/power/main.c
 ===================================================================
---- linux-2.6.23-rc8.orig/drivers/base/power/main.c
-+++ linux-2.6.23-rc8/drivers/base/power/main.c
-@@ -37,9 +37,9 @@
+--- linux-2.6.orig/drivers/base/power/main.c
++++ linux-2.6/drivers/base/power/main.c
+@@ -40,9 +40,9 @@
+ 
+ void device_pm_add(struct device *dev)
  {
- 	int error;
- 
 -	pr_debug("PM: Adding info for %s:%s\n",
-+	/*pr_debug("PM: Adding info for %s:%s\n",
++	/* pr_debug("PM: Adding info for %s:%s\n",
  		 dev->bus ? dev->bus->name : "No Bus",
 -		 kobject_name(&dev->kobj));
-+		 kobject_name(&dev->kobj));*/
++		 kobject_name(&dev->kobj)); */
  	mutex_lock(&dpm_list_mtx);
  	list_add_tail(&dev->power.entry, &dpm_active);
- 	error = dpm_sysfs_add(dev);
+ 	mutex_unlock(&dpm_list_mtx);

Modified: branches/src/target/kernel/2.6.24.x/patches/s3c2410_touchscreen.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/s3c2410_touchscreen.patch	2007-12-05 06:51:58 UTC (rev 3570)
+++ branches/src/target/kernel/2.6.24.x/patches/s3c2410_touchscreen.patch	2007-12-05 06:57:15 UTC (rev 3571)
@@ -1,7 +1,7 @@
-Index: linux-2.6.22/arch/arm/plat-s3c24xx/devs.c
+Index: linux-2.6/arch/arm/plat-s3c24xx/devs.c
 ===================================================================
---- linux-2.6.22.orig/arch/arm/plat-s3c24xx/devs.c
-+++ linux-2.6.22/arch/arm/plat-s3c24xx/devs.c
+--- linux-2.6.orig/arch/arm/plat-s3c24xx/devs.c
++++ linux-2.6/arch/arm/plat-s3c24xx/devs.c
 @@ -24,6 +24,7 @@
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>
@@ -34,10 +34,10 @@
  /* USB Device (Gadget)*/
  
  static struct resource s3c_usbgadget_resource[] = {
-Index: linux-2.6.22/include/asm-arm/plat-s3c24xx/devs.h
+Index: linux-2.6/include/asm-arm/plat-s3c24xx/devs.h
 ===================================================================
---- linux-2.6.22.orig/include/asm-arm/plat-s3c24xx/devs.h
-+++ linux-2.6.22/include/asm-arm/plat-s3c24xx/devs.h
+--- linux-2.6.orig/include/asm-arm/plat-s3c24xx/devs.h
++++ linux-2.6/include/asm-arm/plat-s3c24xx/devs.h
 @@ -42,6 +42,7 @@
  extern struct platform_device s3c_device_timer3;
  
@@ -46,10 +46,10 @@
  
  /* s3c2440 specific devices */
  
-Index: linux-2.6.22/arch/arm/mach-s3c2410/mach-h1940.c
+Index: linux-2.6/arch/arm/mach-s3c2410/mach-h1940.c
 ===================================================================
---- linux-2.6.22.orig/arch/arm/mach-s3c2410/mach-h1940.c
-+++ linux-2.6.22/arch/arm/mach-s3c2410/mach-h1940.c
+--- linux-2.6.orig/arch/arm/mach-s3c2410/mach-h1940.c
++++ linux-2.6/arch/arm/mach-s3c2410/mach-h1940.c
 @@ -38,6 +38,7 @@
  #include <asm/arch/h1940.h>
  #include <asm/arch/h1940-latch.h>
@@ -70,7 +70,7 @@
  
  /**
   * Set lcd on or off
-@@ -190,6 +196,7 @@
+@@ -186,6 +192,7 @@
  	&s3c_device_i2c,
  	&s3c_device_iis,
  	&s3c_device_usbgadget,
@@ -78,18 +78,18 @@
  	&s3c_device_leds,
  	&s3c_device_bluetooth,
  };
-@@ -218,6 +225,7 @@
+@@ -214,6 +221,7 @@
  	u32 tmp;
  
- 	s3c24xx_fb_set_platdata(&h1940_lcdcfg);
+ 	s3c24xx_fb_set_platdata(&h1940_fb_info);
 +	set_s3c2410ts_info(&h1940_ts_cfg);
   	s3c24xx_udc_set_platdata(&h1940_udc_cfg);
  
  	/* Turn off suspend on both USB ports, and switch the
-Index: linux-2.6.22/drivers/input/touchscreen/Kconfig
+Index: linux-2.6/drivers/input/touchscreen/Kconfig
 ===================================================================
---- linux-2.6.22.orig/drivers/input/touchscreen/Kconfig
-+++ linux-2.6.22/drivers/input/touchscreen/Kconfig
+--- linux-2.6.orig/drivers/input/touchscreen/Kconfig
++++ linux-2.6/drivers/input/touchscreen/Kconfig
 @@ -67,6 +67,24 @@
  	  To compile this driver as a module, choose M here: the
  	  module will be called fujitsu-ts.
@@ -115,19 +115,19 @@
  config TOUCHSCREEN_GUNZE
  	tristate "Gunze AHL-51S touchscreen"
  	select SERIO
-Index: linux-2.6.22/drivers/input/touchscreen/Makefile
+Index: linux-2.6/drivers/input/touchscreen/Makefile
 ===================================================================
---- linux-2.6.22.orig/drivers/input/touchscreen/Makefile
-+++ linux-2.6.22/drivers/input/touchscreen/Makefile
-@@ -18,3 +18,4 @@
+--- linux-2.6.orig/drivers/input/touchscreen/Makefile
++++ linux-2.6/drivers/input/touchscreen/Makefile
+@@ -19,3 +19,4 @@
  obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)	+= touchright.o
  obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)	+= touchwin.o
  obj-$(CONFIG_TOUCHSCREEN_UCB1400)	+= ucb1400_ts.o
 +obj-$(CONFIG_TOUCHSCREEN_S3C2410)	+= s3c2410_ts.o
-Index: linux-2.6.22/drivers/input/touchscreen/s3c2410_ts.c
+Index: linux-2.6/drivers/input/touchscreen/s3c2410_ts.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22/drivers/input/touchscreen/s3c2410_ts.c
++++ linux-2.6/drivers/input/touchscreen/s3c2410_ts.c
 @@ -0,0 +1,427 @@
 +/*
 + * This program is free software; you can redistribute it and/or modify
@@ -556,10 +556,10 @@
 +        c-basic-offset: 8
 +    End:
 +*/
-Index: linux-2.6.22/include/asm-arm/arch-s3c2410/ts.h
+Index: linux-2.6/include/asm-arm/arch-s3c2410/ts.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22/include/asm-arm/arch-s3c2410/ts.h
++++ linux-2.6/include/asm-arm/arch-s3c2410/ts.h
 @@ -0,0 +1,28 @@
 +/* linux/include/asm/arch-s3c2410/ts.h
 + *
@@ -589,10 +589,10 @@
 +
 +#endif /* __ASM_ARM_TS_H */
 +
-Index: linux-2.6.22/arch/arm/plat-s3c24xx/s3c244x.c
+Index: linux-2.6/arch/arm/plat-s3c24xx/s3c244x.c
 ===================================================================
---- linux-2.6.22.orig/arch/arm/plat-s3c24xx/s3c244x.c
-+++ linux-2.6.22/arch/arm/plat-s3c24xx/s3c244x.c
+--- linux-2.6.orig/arch/arm/plat-s3c24xx/s3c244x.c
++++ linux-2.6/arch/arm/plat-s3c24xx/s3c244x.c
 @@ -67,6 +67,7 @@
  
  	s3c_device_i2c.name  = "s3c2440-i2c";

Modified: branches/src/target/kernel/2.6.24.x/patches/s3c_mci.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/s3c_mci.patch	2007-12-05 06:51:58 UTC (rev 3570)
+++ branches/src/target/kernel/2.6.24.x/patches/s3c_mci.patch	2007-12-05 06:57:15 UTC (rev 3571)
@@ -1,9 +1,9 @@
 This is the latest S3C MMC/SD driver by Thomas Kleffel
 
-Index: linux-2.6.22.1/include/asm-arm/arch-s3c2410/regs-sdi.h
+Index: linux-2.6/include/asm-arm/arch-s3c2410/regs-sdi.h
 ===================================================================
---- linux-2.6.22.1.orig/include/asm-arm/arch-s3c2410/regs-sdi.h	2007-07-19 01:10:32.537282965 +0200
-+++ linux-2.6.22.1/include/asm-arm/arch-s3c2410/regs-sdi.h	2007-07-19 01:10:38.565626502 +0200
+--- linux-2.6.orig/include/asm-arm/arch-s3c2410/regs-sdi.h
++++ linux-2.6/include/asm-arm/arch-s3c2410/regs-sdi.h
 @@ -28,9 +28,15 @@
  #define S3C2410_SDIDCNT               (0x30)
  #define S3C2410_SDIDSTA               (0x34)
@@ -71,10 +71,10 @@
  #define S3C2410_SDIFSTA_RFLAST         (1<<9)
  #define S3C2410_SDIFSTA_RFFULL         (1<<8)
  #define S3C2410_SDIFSTA_RFHALF         (1<<7)
-Index: linux-2.6.22.1/drivers/mmc/host/mmc_debug.c
+Index: linux-2.6/drivers/mmc/host/mmc_debug.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22.1/drivers/mmc/host/mmc_debug.c	2007-07-19 01:15:25.233962797 +0200
+--- /dev/null
++++ linux-2.6/drivers/mmc/host/mmc_debug.c
 @@ -0,0 +1,61 @@
 +/*
 + *  linux/drivers/mmc/mmc_debug.c
@@ -137,10 +137,10 @@
 +	}
 +}
 +EXPORT_SYMBOL(mmc_err2str);
-Index: linux-2.6.22.1/drivers/mmc/host/mmc_debug.h
+Index: linux-2.6/drivers/mmc/host/mmc_debug.h
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22.1/drivers/mmc/host/mmc_debug.h	2007-07-19 01:10:38.597628323 +0200
+--- /dev/null
++++ linux-2.6/drivers/mmc/host/mmc_debug.h
 @@ -0,0 +1,7 @@
 +#ifndef MMC_DEBUG_H
 +#define MMC_DEBUG_H
@@ -149,10 +149,10 @@
 +char *mmc_err2str(int err);
 +
 +#endif /* MMC_DEBUG_H */
-Index: linux-2.6.22.1/drivers/mmc/host/s3cmci.c
+Index: linux-2.6/drivers/mmc/host/s3cmci.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22.1/drivers/mmc/host/s3cmci.c	2007-07-19 01:13:22.862989265 +0200
+--- /dev/null
++++ linux-2.6/drivers/mmc/host/s3cmci.c
 @@ -0,0 +1,1341 @@
 +/*
 + *  linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
@@ -1495,10 +1495,10 @@
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Thomas Kleffel <tk at maintech.de>");
 +
-Index: linux-2.6.22.1/drivers/mmc/host/s3cmci.h
+Index: linux-2.6/drivers/mmc/host/s3cmci.h
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22.1/drivers/mmc/host/s3cmci.h	2007-07-19 01:13:22.334959182 +0200
+--- /dev/null
++++ linux-2.6/drivers/mmc/host/s3cmci.h
 @@ -0,0 +1,71 @@
 +/*
 + *  linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
@@ -1571,14 +1571,14 @@
 +	unsigned int		ccnt, dcnt;
 +	struct tasklet_struct	pio_tasklet;
 +};
-Index: linux-2.6.22.1/drivers/mmc/host/Kconfig
+Index: linux-2.6/drivers/mmc/host/Kconfig
 ===================================================================
---- linux-2.6.22.1.orig/drivers/mmc/host/Kconfig	2007-07-19 01:10:43.497907574 +0200
-+++ linux-2.6.22.1/drivers/mmc/host/Kconfig	2007-07-19 01:11:57.214108422 +0200
-@@ -100,3 +100,14 @@
-           To compile this driver as a module, choose M here: the
- 	  module will be called tifm_sd.
+--- linux-2.6.orig/drivers/mmc/host/Kconfig
++++ linux-2.6/drivers/mmc/host/Kconfig
+@@ -130,3 +130,14 @@
  
+ 	  If unsure, or if your system has no SPI master driver, say N.
+ 
 +config MMC_S3C
 +	tristate "Samsung S3C SD/MMC Card Interface support"
 +	depends on ARCH_S3C2410 && MMC
@@ -1590,14 +1590,14 @@
 +
 +	  If unsure, say N.
 +
-Index: linux-2.6.22.1/drivers/mmc/host/Makefile
+Index: linux-2.6/drivers/mmc/host/Makefile
 ===================================================================
---- linux-2.6.22.1.orig/drivers/mmc/host/Makefile	2007-07-19 01:10:43.517908714 +0200
-+++ linux-2.6.22.1/drivers/mmc/host/Makefile	2007-07-19 01:11:07.043249347 +0200
-@@ -15,4 +15,6 @@
- obj-$(CONFIG_MMC_OMAP)		+= omap.o
+--- linux-2.6.orig/drivers/mmc/host/Makefile
++++ linux-2.6/drivers/mmc/host/Makefile
+@@ -17,4 +17,5 @@
  obj-$(CONFIG_MMC_AT91)		+= at91_mci.o
  obj-$(CONFIG_MMC_TIFM_SD)	+= tifm_sd.o
+ obj-$(CONFIG_MMC_SPI)		+= mmc_spi.o
+-
 +obj-$(CONFIG_MMC_S3C)   	+= s3cmci.o
-+obj-$(CONFIG_MMC)			+= mmc_debug.o
- 
++obj-$(CONFIG_MMC)		+= mmc_debug.o





More information about the commitlog mailing list