r3046 - branches/src/target/kernel/2.6.23.x/patches

shoragan at sita.openmoko.org shoragan at sita.openmoko.org
Wed Sep 26 18:13:03 CEST 2007


Author: shoragan
Date: 2007-09-26 18:12:59 +0200 (Wed, 26 Sep 2007)
New Revision: 3046

Modified:
   branches/src/target/kernel/2.6.23.x/patches/asoc-platform-hw_init-pcm_emulation-fix.patch
   branches/src/target/kernel/2.6.23.x/patches/g_ether-highpower.patch
   branches/src/target/kernel/2.6.23.x/patches/g_ether-vendor_product.patch
   branches/src/target/kernel/2.6.23.x/patches/gta01-vibrator.patch
   branches/src/target/kernel/2.6.23.x/patches/hxd8-tsl256x.patch
   branches/src/target/kernel/2.6.23.x/patches/i2c-permit_invalid_addrs.patch
   branches/src/target/kernel/2.6.23.x/patches/missing_defs.patch
   branches/src/target/kernel/2.6.23.x/patches/openmoko-logo.patch
   branches/src/target/kernel/2.6.23.x/patches/pm-debug_less_verbose.patch
   branches/src/target/kernel/2.6.23.x/patches/qt2410-cs8900.patch
   branches/src/target/kernel/2.6.23.x/patches/s3c2410_serial-nodebug.patch
   branches/src/target/kernel/2.6.23.x/patches/s3c2410_touchscreen.patch
   branches/src/target/kernel/2.6.23.x/patches/s3c2442b-cpuid.patch
   branches/src/target/kernel/2.6.23.x/patches/series
   branches/src/target/kernel/2.6.23.x/patches/smedia-glamo.patch
   branches/src/target/kernel/2.6.23.x/patches/yaffs2-20070905.patch
Log:
Resync with 2.6.23-rc8

Modified: branches/src/target/kernel/2.6.23.x/patches/asoc-platform-hw_init-pcm_emulation-fix.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/asoc-platform-hw_init-pcm_emulation-fix.patch	2007-09-26 16:10:36 UTC (rev 3045)
+++ branches/src/target/kernel/2.6.23.x/patches/asoc-platform-hw_init-pcm_emulation-fix.patch	2007-09-26 16:12:59 UTC (rev 3046)
@@ -4,11 +4,11 @@
 
 Signed-off-by: Harald Welte <laforge at openmoko.org>
 
-Index: linux-2.6.20/sound/soc/s3c24xx/s3c24xx-pcm.c
+Index: linux-2.6.23-rc8/sound/soc/s3c24xx/s3c24xx-pcm.c
 ===================================================================
---- linux-2.6.20.orig/sound/soc/s3c24xx/s3c24xx-pcm.c	2007-02-15 21:50:25.000000000 +0100
-+++ linux-2.6.20/sound/soc/s3c24xx/s3c24xx-pcm.c	2007-02-15 22:25:10.000000000 +0100
-@@ -155,18 +155,22 @@
+--- linux-2.6.23-rc8.orig/sound/soc/s3c24xx/s3c24xx-pcm.c
++++ linux-2.6.23-rc8/sound/soc/s3c24xx/s3c24xx-pcm.c
+@@ -158,18 +158,22 @@
  	if (!dma)
  		return 0;
  

Modified: branches/src/target/kernel/2.6.23.x/patches/g_ether-highpower.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/g_ether-highpower.patch	2007-09-26 16:10:36 UTC (rev 3045)
+++ branches/src/target/kernel/2.6.23.x/patches/g_ether-highpower.patch	2007-09-26 16:12:59 UTC (rev 3046)
@@ -1,8 +1,8 @@
-Index: linux-2.6.17.14-fic4.test/drivers/usb/gadget/ether.c
+Index: linux-2.6.23-rc8/drivers/usb/gadget/ether.c
 ===================================================================
---- linux-2.6.17.14-fic4.test.orig/drivers/usb/gadget/ether.c	2007-01-21 21:31:48.000000000 +0100
-+++ linux-2.6.17.14-fic4.test/drivers/usb/gadget/ether.c	2007-01-21 21:34:31.000000000 +0100
-@@ -462,7 +462,7 @@
+--- linux-2.6.23-rc8.orig/drivers/usb/gadget/ether.c
++++ linux-2.6.23-rc8/drivers/usb/gadget/ether.c
+@@ -486,7 +486,7 @@
  	.bConfigurationValue =	DEV_CONFIG_VALUE,
  	.iConfiguration =	STRING_CDC,
  	.bmAttributes =		USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,
@@ -11,7 +11,7 @@
  };
  
  #ifdef	CONFIG_USB_ETH_RNDIS
-@@ -476,7 +476,7 @@
+@@ -500,7 +500,7 @@
  	.bConfigurationValue =  DEV_RNDIS_CONFIG_VALUE,
  	.iConfiguration =       STRING_RNDIS,
  	.bmAttributes =		USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,

Modified: branches/src/target/kernel/2.6.23.x/patches/g_ether-vendor_product.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/g_ether-vendor_product.patch	2007-09-26 16:10:36 UTC (rev 3045)
+++ branches/src/target/kernel/2.6.23.x/patches/g_ether-vendor_product.patch	2007-09-26 16:12:59 UTC (rev 3046)
@@ -3,11 +3,11 @@
 Yes, we could solve this by some modprobe.conf parameters, but I'd like to
 rather not rely on this.
 
-Index: linux-2.6.20.1/drivers/usb/gadget/ether.c
+Index: linux-2.6.23-rc8/drivers/usb/gadget/ether.c
 ===================================================================
---- linux-2.6.20.1.orig/drivers/usb/gadget/ether.c	2007-03-12 21:57:28.000000000 +0100
-+++ linux-2.6.20.1/drivers/usb/gadget/ether.c	2007-03-12 22:01:28.000000000 +0100
-@@ -149,11 +149,8 @@
+--- linux-2.6.23-rc8.orig/drivers/usb/gadget/ether.c
++++ linux-2.6.23-rc8/drivers/usb/gadget/ether.c
+@@ -156,11 +156,8 @@
   * Instead:  allocate your own, using normal USB-IF procedures.
   */
  
@@ -21,7 +21,7 @@
  
  /* For hardware that can't talk CDC, we use the same vendor ID that
   * ARM Linux has used for ethernet-over-usb, both with sa1100 and
-@@ -174,8 +171,8 @@
+@@ -181,8 +178,8 @@
   * used with CDC Ethernet, Linux 2.4 hosts will need updates to choose
   * the non-RNDIS configuration.
   */

Modified: branches/src/target/kernel/2.6.23.x/patches/gta01-vibrator.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/gta01-vibrator.patch	2007-09-26 16:10:36 UTC (rev 3045)
+++ branches/src/target/kernel/2.6.23.x/patches/gta01-vibrator.patch	2007-09-26 16:12:59 UTC (rev 3046)
@@ -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.21-moko/drivers/leds/leds-gta01.c
+Index: linux-2.6.23-rc8/drivers/leds/leds-gta01.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.21-moko/drivers/leds/leds-gta01.c
++++ linux-2.6.23-rc8/drivers/leds/leds-gta01.c
 @@ -0,0 +1,133 @@
 +/*
 + * LED driver for the FIC GTA01 (Neo1973) GSM Phone Vibrator
@@ -140,13 +140,13 @@
 +MODULE_AUTHOR("Harald Welte <laforge at openmoko.org>");
 +MODULE_DESCRIPTION("FIC GTA01 Vibrator driver");
 +MODULE_LICENSE("GPL");
-Index: linux-2.6.21-moko/drivers/leds/Kconfig
+Index: linux-2.6.23-rc8/drivers/leds/Kconfig
 ===================================================================
---- linux-2.6.21-moko.orig/drivers/leds/Kconfig
-+++ linux-2.6.21-moko/drivers/leds/Kconfig
-@@ -94,6 +94,12 @@
- 	help
- 	  This option enables support for the front LED on Cobalt Server
+--- linux-2.6.23-rc8.orig/drivers/leds/Kconfig
++++ linux-2.6.23-rc8/drivers/leds/Kconfig
+@@ -101,6 +101,12 @@
+ 	  outputs. To be useful the particular board must have LEDs
+ 	  and they must be connected to the GPIO lines.
  
 +config LEDS_GTA01
 +	tristate "Vibrator Support for the FIC Neo1973 (GTA01) Vibrator"
@@ -157,14 +157,14 @@
  comment "LED Triggers"
  
  config LEDS_TRIGGERS
-Index: linux-2.6.21-moko/drivers/leds/Makefile
+Index: linux-2.6.23-rc8/drivers/leds/Makefile
 ===================================================================
---- linux-2.6.21-moko.orig/drivers/leds/Makefile
-+++ linux-2.6.21-moko/drivers/leds/Makefile
-@@ -16,6 +16,7 @@
- obj-$(CONFIG_LEDS_WRAP)			+= leds-wrap.o
+--- linux-2.6.23-rc8.orig/drivers/leds/Makefile
++++ linux-2.6.23-rc8/drivers/leds/Makefile
+@@ -17,6 +17,7 @@
  obj-$(CONFIG_LEDS_H1940)		+= leds-h1940.o
  obj-$(CONFIG_LEDS_COBALT)		+= leds-cobalt.o
+ obj-$(CONFIG_LEDS_GPIO)			+= leds-gpio.o
 +obj-$(CONFIG_LEDS_GTA01)		+= leds-gta01.o
  
  # LED Triggers

Modified: branches/src/target/kernel/2.6.23.x/patches/hxd8-tsl256x.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/hxd8-tsl256x.patch	2007-09-26 16:10:36 UTC (rev 3045)
+++ branches/src/target/kernel/2.6.23.x/patches/hxd8-tsl256x.patch	2007-09-26 16:12:59 UTC (rev 3046)
@@ -1,7 +1,7 @@
-Index: linux-2.6.22.5-moko/drivers/i2c/chips/tsl256x.c
+Index: linux-2.6.23-rc8/drivers/i2c/chips/tsl256x.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/drivers/i2c/chips/tsl256x.c
++++ linux-2.6.23-rc8/drivers/i2c/chips/tsl256x.c
 @@ -0,0 +1,310 @@
 +/*
 + * tsl256x.c  --  TSL256x Light Sensor driver
@@ -313,10 +313,10 @@
 +module_init(tsl256x_init);
 +module_exit(tsl256x_exit);
 +
-Index: linux-2.6.22.5-moko/drivers/i2c/chips/tsl256x.h
+Index: linux-2.6.23-rc8/drivers/i2c/chips/tsl256x.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/drivers/i2c/chips/tsl256x.h
++++ linux-2.6.23-rc8/drivers/i2c/chips/tsl256x.h
 @@ -0,0 +1,154 @@
 +/*
 + * tsl256x.h  --  TSL256x Light Sensor driver
@@ -472,13 +472,13 @@
 +
 +#endif /* _TSL256X_H */
 +
-Index: linux-2.6.22.5-moko/drivers/i2c/chips/Kconfig
+Index: linux-2.6.23-rc8/drivers/i2c/chips/Kconfig
 ===================================================================
---- linux-2.6.22.5-moko.orig/drivers/i2c/chips/Kconfig
-+++ linux-2.6.22.5-moko/drivers/i2c/chips/Kconfig
-@@ -135,4 +135,14 @@
- 	  This driver can also be built as a module.  If so, the module
- 	  will be called max6875.
+--- linux-2.6.23-rc8.orig/drivers/i2c/chips/Kconfig
++++ linux-2.6.23-rc8/drivers/i2c/chips/Kconfig
+@@ -174,4 +174,14 @@
+ 	  and other features that are often used in portable devices like
+ 	  cell phones and PDAs.
  
 +config SENSORS_TSL256X
 +	tristate "Texas TSL256X Ambient Light Sensor"
@@ -491,23 +491,23 @@
 +	  will be called tsl256x.
 +
  endmenu
-Index: linux-2.6.22.5-moko/drivers/i2c/chips/Makefile
+Index: linux-2.6.23-rc8/drivers/i2c/chips/Makefile
 ===================================================================
---- linux-2.6.22.5-moko.orig/drivers/i2c/chips/Makefile
-+++ linux-2.6.22.5-moko/drivers/i2c/chips/Makefile
-@@ -13,6 +13,7 @@
- obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
- obj-$(CONFIG_ISP1301_OMAP)	+= isp1301_omap.o
+--- linux-2.6.23-rc8.orig/drivers/i2c/chips/Makefile
++++ linux-2.6.23-rc8/drivers/i2c/chips/Makefile
+@@ -16,6 +16,7 @@
  obj-$(CONFIG_TPS65010)		+= tps65010.o
+ obj-$(CONFIG_MENELAUS)		+= menelaus.o
+ obj-$(CONFIG_SENSORS_TSL2550)	+= tsl2550.o
 +obj-$(CONFIG_SENSORS_TSL256X)	+= tsl256x.o
  
  ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
  EXTRA_CFLAGS += -DDEBUG
-Index: linux-2.6.22.5-moko/include/linux/i2c-id.h
+Index: linux-2.6.23-rc8/include/linux/i2c-id.h
 ===================================================================
---- linux-2.6.22.5-moko.orig/include/linux/i2c-id.h
-+++ linux-2.6.22.5-moko/include/linux/i2c-id.h
-@@ -162,6 +162,7 @@
+--- linux-2.6.23-rc8.orig/include/linux/i2c-id.h
++++ linux-2.6.23-rc8/include/linux/i2c-id.h
+@@ -161,6 +161,7 @@
  #define I2C_DRIVERID_W83L785TS 1047
  #define I2C_DRIVERID_OV7670 1048	/* Omnivision 7670 camera */
  #define I2C_DRIVERID_PCF50606 1049

Modified: branches/src/target/kernel/2.6.23.x/patches/i2c-permit_invalid_addrs.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/i2c-permit_invalid_addrs.patch	2007-09-26 16:10:36 UTC (rev 3045)
+++ branches/src/target/kernel/2.6.23.x/patches/i2c-permit_invalid_addrs.patch	2007-09-26 16:12:59 UTC (rev 3046)
@@ -3,11 +3,11 @@
 
 Signed-off-by: Harald Welte <laforge at openmoko.org>
 
-Index: linux-2.6.20/drivers/i2c/i2c-core.c
+Index: linux-2.6.23-rc8/drivers/i2c/i2c-core.c
 ===================================================================
---- linux-2.6.20.orig/drivers/i2c/i2c-core.c	2007-02-15 20:30:14.000000000 +0100
-+++ linux-2.6.20/drivers/i2c/i2c-core.c	2007-02-15 20:30:22.000000000 +0100
-@@ -701,11 +701,11 @@
+--- linux-2.6.23-rc8.orig/drivers/i2c/i2c-core.c
++++ linux-2.6.23-rc8/drivers/i2c/i2c-core.c
+@@ -967,11 +967,11 @@
  	int err;
  
  	/* Make sure the address is valid */

Modified: branches/src/target/kernel/2.6.23.x/patches/missing_defs.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/missing_defs.patch	2007-09-26 16:10:36 UTC (rev 3045)
+++ branches/src/target/kernel/2.6.23.x/patches/missing_defs.patch	2007-09-26 16:12:59 UTC (rev 3046)
@@ -1,8 +1,8 @@
-Index: linux-2.6.22.1/include/linux/mmc/core.h
+Index: linux-2.6.23-rc8/include/linux/mmc/core.h
 ===================================================================
---- linux-2.6.22.1.orig/include/linux/mmc/core.h	2007-07-19 00:30:53.705721081 +0200
-+++ linux-2.6.22.1/include/linux/mmc/core.h	2007-07-19 00:30:57.097914392 +0200
-@@ -56,12 +56,15 @@
+--- linux-2.6.23-rc8.orig/include/linux/mmc/core.h
++++ linux-2.6.23-rc8/include/linux/mmc/core.h
+@@ -54,12 +54,15 @@
  	unsigned int		retries;	/* max number of retries */
  	unsigned int		error;		/* command error */
  
@@ -24,10 +24,10 @@
  
  	struct mmc_data		*data;		/* data segment associated with cmd */
  	struct mmc_request	*mrq;		/* associated request */
-Index: linux-2.6.22.1/include/linux/mmc/mmc.h
+Index: linux-2.6.23-rc8/include/linux/mmc/mmc.h
 ===================================================================
---- linux-2.6.22.1.orig/include/linux/mmc/mmc.h	2007-07-19 00:30:50.197521158 +0200
-+++ linux-2.6.22.1/include/linux/mmc/mmc.h	2007-07-19 00:30:57.133916442 +0200
+--- linux-2.6.23-rc8.orig/include/linux/mmc/mmc.h
++++ linux-2.6.23-rc8/include/linux/mmc/mmc.h
 @@ -78,6 +78,21 @@
  #define MMC_APP_CMD              55   /* ac   [31:16] RCA        R1  */
  #define MMC_GEN_CMD              56   /* adtc [0] RD/WR          R1  */

Modified: branches/src/target/kernel/2.6.23.x/patches/openmoko-logo.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/openmoko-logo.patch	2007-09-26 16:10:36 UTC (rev 3045)
+++ branches/src/target/kernel/2.6.23.x/patches/openmoko-logo.patch	2007-09-26 16:12:59 UTC (rev 3046)
@@ -1,7 +1,7 @@
-Index: linux-2.6.22.1/drivers/video/logo/logo_openmoko_clut224.ppm
+Index: linux-2.6.23-rc8/drivers/video/logo/logo_openmoko_clut224.ppm
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.1/drivers/video/logo/logo_openmoko_clut224.ppm
++++ linux-2.6.23-rc8/drivers/video/logo/logo_openmoko_clut224.ppm
 @@ -0,0 +1,40003 @@
 +P3
 +480 500
@@ -40006,11 +40006,11 @@
 +0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
 +0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
 +0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-Index: linux-2.6.22.1/drivers/video/logo/Kconfig
+Index: linux-2.6.23-rc8/drivers/video/logo/Kconfig
 ===================================================================
---- linux-2.6.22.1.orig/drivers/video/logo/Kconfig
-+++ linux-2.6.22.1/drivers/video/logo/Kconfig
-@@ -62,6 +62,11 @@
+--- linux-2.6.23-rc8.orig/drivers/video/logo/Kconfig
++++ linux-2.6.23-rc8/drivers/video/logo/Kconfig
+@@ -67,6 +67,11 @@
  	depends on SUPERH
  	default y
  
@@ -40022,31 +40022,31 @@
  config LOGO_M32R_CLUT224
  	bool "224-color M32R Linux logo"
  	depends on M32R
-Index: linux-2.6.22.1/drivers/video/logo/Makefile
+Index: linux-2.6.23-rc8/drivers/video/logo/Makefile
 ===================================================================
---- linux-2.6.22.1.orig/drivers/video/logo/Makefile
-+++ linux-2.6.22.1/drivers/video/logo/Makefile
+--- linux-2.6.23-rc8.orig/drivers/video/logo/Makefile
++++ linux-2.6.23-rc8/drivers/video/logo/Makefile
 @@ -13,6 +13,7 @@
  obj-$(CONFIG_LOGO_SUPERH_VGA16)		+= logo_superh_vga16.o
  obj-$(CONFIG_LOGO_SUPERH_CLUT224)	+= logo_superh_clut224.o
  obj-$(CONFIG_LOGO_M32R_CLUT224)		+= logo_m32r_clut224.o
 +obj-$(CONFIG_LOGO_OPENMOKO_CLUT224)	+= logo_openmoko_clut224.o
  
- # How to generate logo's
+ obj-$(CONFIG_SPU_BASE)			+= logo_spe_clut224.o
  
-Index: linux-2.6.22.1/drivers/video/logo/logo.c
+Index: linux-2.6.23-rc8/drivers/video/logo/logo.c
 ===================================================================
---- linux-2.6.22.1.orig/drivers/video/logo/logo.c
-+++ linux-2.6.22.1/drivers/video/logo/logo.c
+--- linux-2.6.23-rc8.orig/drivers/video/logo/logo.c
++++ linux-2.6.23-rc8/drivers/video/logo/logo.c
 @@ -33,6 +33,7 @@
  extern const struct linux_logo logo_superh_vga16;
  extern const struct linux_logo logo_superh_clut224;
  extern const struct linux_logo logo_m32r_clut224;
 +extern const struct linux_logo logo_openmoko_clut224;
  
- 
- const struct linux_logo *fb_find_logo(int depth)
-@@ -101,6 +102,10 @@
+ /* logo's are marked __initdata. Use __init_refok to tell
+  * modpost that it is intended that this function uses data
+@@ -104,6 +105,10 @@
  		/* M32R Linux logo */
  		logo = &logo_m32r_clut224;
  #endif

Modified: branches/src/target/kernel/2.6.23.x/patches/pm-debug_less_verbose.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/pm-debug_less_verbose.patch	2007-09-26 16:10:36 UTC (rev 3045)
+++ branches/src/target/kernel/2.6.23.x/patches/pm-debug_less_verbose.patch	2007-09-26 16:12:59 UTC (rev 3046)
@@ -1,8 +1,8 @@
-Index: linux-2.6.21-moko/drivers/base/power/main.c
+Index: linux-2.6.23-rc8/drivers/base/power/main.c
 ===================================================================
---- linux-2.6.21-moko.orig/drivers/base/power/main.c
-+++ linux-2.6.21-moko/drivers/base/power/main.c
-@@ -53,9 +53,9 @@
+--- 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 @@
  {
  	int error;
  
@@ -10,7 +10,7 @@
 +	/*pr_debug("PM: Adding info for %s:%s\n",
  		 dev->bus ? dev->bus->name : "No Bus",
 -		 kobject_name(&dev->kobj));
-+		 kobject_name(&dev->kobj)); */
- 	down(&dpm_list_sem);
++		 kobject_name(&dev->kobj));*/
+ 	mutex_lock(&dpm_list_mtx);
  	list_add_tail(&dev->power.entry, &dpm_active);
- 	device_pm_set_parent(dev, dev->parent);
+ 	error = dpm_sysfs_add(dev);

Modified: branches/src/target/kernel/2.6.23.x/patches/qt2410-cs8900.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/qt2410-cs8900.patch	2007-09-26 16:10:36 UTC (rev 3045)
+++ branches/src/target/kernel/2.6.23.x/patches/qt2410-cs8900.patch	2007-09-26 16:12:59 UTC (rev 3046)
@@ -1,17 +1,17 @@
-Index: linux-2.6.17.14-fic3/drivers/net/Kconfig
+Index: linux-2.6.23-rc8/drivers/net/Kconfig
 ===================================================================
---- linux-2.6.17.14-fic3.orig/drivers/net/Kconfig	2006-12-07 16:16:46.000000000 +0100
-+++ linux-2.6.17.14-fic3/drivers/net/Kconfig	2006-12-07 16:17:50.000000000 +0100
-@@ -1246,7 +1246,7 @@
+--- linux-2.6.23-rc8.orig/drivers/net/Kconfig
++++ linux-2.6.23-rc8/drivers/net/Kconfig
+@@ -1322,7 +1322,7 @@
  
  config NET_PCI
  	bool "EISA, VLB, PCI and on board controllers"
--	depends on NET_ETHERNET && (ISA || EISA || PCI)
-+	depends on NET_ETHERNET && (ISA || EISA || PCI || MACH_QT2410)
+-	depends on ISA || EISA || PCI
++	depends on ISA || EISA || PCI || MACH_QT2410
  	help
  	  This is another class of network cards which attach directly to the
  	  bus. If you have one of those, say Y and read the Ethernet-HOWTO,
-@@ -1386,7 +1386,7 @@
+@@ -1496,7 +1496,7 @@
  
  config CS89x0
  	tristate "CS89x0 support"
@@ -20,11 +20,11 @@
  	---help---
  	  Support for CS89x0 chipset based Ethernet cards. If you have a
  	  network (Ethernet) card of this type, say Y and read the
-Index: linux-2.6.17.14-fic3/drivers/net/cs89x0.c
+Index: linux-2.6.23-rc8/drivers/net/cs89x0.c
 ===================================================================
---- linux-2.6.17.14-fic3.orig/drivers/net/cs89x0.c	2006-12-07 16:16:46.000000000 +0100
-+++ linux-2.6.17.14-fic3/drivers/net/cs89x0.c	2006-12-07 16:17:50.000000000 +0100
-@@ -195,6 +195,10 @@
+--- linux-2.6.23-rc8.orig/drivers/net/cs89x0.c
++++ linux-2.6.23-rc8/drivers/net/cs89x0.c
+@@ -194,6 +194,10 @@
  #define CIRRUS_DEFAULT_IRQ	VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */
  static unsigned int netcard_portlist[] __initdata = {CIRRUS_DEFAULT_BASE, 0};
  static unsigned int cs8900_irq_map[] = {CIRRUS_DEFAULT_IRQ, 0, 0, 0};
@@ -35,7 +35,7 @@
  #else
  static unsigned int netcard_portlist[] __initdata =
     { 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0};
-@@ -830,6 +834,14 @@
+@@ -829,6 +833,14 @@
  
  	printk(" IRQ %d", dev->irq);
  
@@ -50,7 +50,7 @@
  #if ALLOW_DMA
  	if (lp->use_dma) {
  		get_dma_channel(dev);
-@@ -1310,7 +1322,7 @@
+@@ -1308,7 +1320,7 @@
  	else
  #endif
  	{

Modified: branches/src/target/kernel/2.6.23.x/patches/s3c2410_serial-nodebug.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/s3c2410_serial-nodebug.patch	2007-09-26 16:10:36 UTC (rev 3045)
+++ branches/src/target/kernel/2.6.23.x/patches/s3c2410_serial-nodebug.patch	2007-09-26 16:12:59 UTC (rev 3046)
@@ -1,8 +1,8 @@
-Index: linux-2.6.17.7-new/drivers/serial/s3c2410.c
+Index: linux-2.6.23-rc8/drivers/serial/s3c2410.c
 ===================================================================
---- linux-2.6.17.7-new.orig/drivers/serial/s3c2410.c	2006-08-12 01:43:50.000000000 +0530
-+++ linux-2.6.17.7-new/drivers/serial/s3c2410.c	2006-08-12 01:44:30.000000000 +0530
-@@ -710,10 +710,6 @@
+--- linux-2.6.23-rc8.orig/drivers/serial/s3c2410.c
++++ linux-2.6.23-rc8/drivers/serial/s3c2410.c
+@@ -708,10 +708,6 @@
  		int calc_deviation;
  
  		for (sptr = res; sptr < resptr; sptr++) {
@@ -13,7 +13,7 @@
  
  			calc_deviation = baud - sptr->calc;
  			if (calc_deviation < 0)
-@@ -725,12 +721,8 @@
+@@ -723,12 +719,8 @@
  			}
  		}
  

Modified: branches/src/target/kernel/2.6.23.x/patches/s3c2410_touchscreen.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/s3c2410_touchscreen.patch	2007-09-26 16:10:36 UTC (rev 3045)
+++ branches/src/target/kernel/2.6.23.x/patches/s3c2410_touchscreen.patch	2007-09-26 16:12:59 UTC (rev 3046)
@@ -1,17 +1,17 @@
-Index: linux-2.6.21-moko/arch/arm/plat-s3c24xx/devs.c
+Index: linux-2.6.23-rc8/arch/arm/plat-s3c24xx/devs.c
 ===================================================================
---- linux-2.6.21-moko.orig/arch/arm/plat-s3c24xx/devs.c
-+++ linux-2.6.21-moko/arch/arm/plat-s3c24xx/devs.c
-@@ -30,6 +30,7 @@
- 
- #include <asm/arch/regs-serial.h>
- #include <asm/arch/udc.h>
+--- linux-2.6.23-rc8.orig/arch/arm/plat-s3c24xx/devs.c
++++ linux-2.6.23-rc8/arch/arm/plat-s3c24xx/devs.c
+@@ -24,6 +24,7 @@
+ #include <asm/mach/map.h>
+ #include <asm/mach/irq.h>
+ #include <asm/arch/fb.h>
 +#include <asm/arch/ts.h>
+ #include <asm/hardware.h>
+ #include <asm/io.h>
+ #include <asm/irq.h>
+@@ -207,6 +208,23 @@
  
- #include <asm/plat-s3c24xx/devs.h>
- #include <asm/plat-s3c24xx/cpu.h>
-@@ -206,6 +207,23 @@
- 
  EXPORT_SYMBOL(s3c_device_nand);
  
 +/* Touchscreen */
@@ -34,11 +34,11 @@
  /* USB Device (Gadget)*/
  
  static struct resource s3c_usbgadget_resource[] = {
-Index: linux-2.6.21-moko/include/asm-arm/plat-s3c24xx/devs.h
+Index: linux-2.6.23-rc8/include/asm-arm/plat-s3c24xx/devs.h
 ===================================================================
---- linux-2.6.21-moko.orig/include/asm-arm/plat-s3c24xx/devs.h
-+++ linux-2.6.21-moko/include/asm-arm/plat-s3c24xx/devs.h
-@@ -41,6 +41,7 @@
+--- linux-2.6.23-rc8.orig/include/asm-arm/plat-s3c24xx/devs.h
++++ linux-2.6.23-rc8/include/asm-arm/plat-s3c24xx/devs.h
+@@ -42,6 +42,7 @@
  extern struct platform_device s3c_device_timer3;
  
  extern struct platform_device s3c_device_usbgadget;
@@ -46,22 +46,22 @@
  
  /* s3c2440 specific devices */
  
-Index: linux-2.6.21-moko/arch/arm/mach-s3c2410/mach-h1940.c
+Index: linux-2.6.23-rc8/arch/arm/mach-s3c2410/mach-h1940.c
 ===================================================================
---- linux-2.6.21-moko.orig/arch/arm/mach-s3c2410/mach-h1940.c
-+++ linux-2.6.21-moko/arch/arm/mach-s3c2410/mach-h1940.c
+--- linux-2.6.23-rc8.orig/arch/arm/mach-s3c2410/mach-h1940.c
++++ linux-2.6.23-rc8/arch/arm/mach-s3c2410/mach-h1940.c
 @@ -38,6 +38,7 @@
+ #include <asm/arch/h1940.h>
  #include <asm/arch/h1940-latch.h>
  #include <asm/arch/fb.h>
- #include <asm/arch/udc.h>
-+#include <asm/arch/ts.h>
++#include <asm/arch/tc.h>
+ #include <asm/plat-s3c24xx/udc.h>
  
  #include <asm/plat-s3c24xx/clock.h>
- #include <asm/plat-s3c24xx/devs.h>
 @@ -129,6 +130,11 @@
+ 	.vbus_pin_inverted	= 1,
  };
  
- 
 +static struct s3c2410_ts_mach_info h1940_ts_cfg __initdata = {
 +		.delay = 10000,
 +		.presc = 49,
@@ -70,14 +70,14 @@
  
  /**
   * Set lcd on or off
-@@ -185,6 +191,7 @@
+@@ -190,6 +196,7 @@
  	&s3c_device_i2c,
  	&s3c_device_iis,
  	&s3c_device_usbgadget,
 +	&s3c_device_ts,
  	&s3c_device_leds,
+ 	&s3c_device_bluetooth,
  };
- 
 @@ -218,6 +225,7 @@
  	u32 tmp;
  
@@ -86,13 +86,13 @@
   	s3c24xx_udc_set_platdata(&h1940_udc_cfg);
  
  	/* Turn off suspend on both USB ports, and switch the
-Index: linux-2.6.21-moko/drivers/input/touchscreen/Kconfig
+Index: linux-2.6.23-rc8/drivers/input/touchscreen/Kconfig
 ===================================================================
---- linux-2.6.21-moko.orig/drivers/input/touchscreen/Kconfig
-+++ linux-2.6.21-moko/drivers/input/touchscreen/Kconfig
-@@ -54,6 +54,24 @@
+--- linux-2.6.23-rc8.orig/drivers/input/touchscreen/Kconfig
++++ linux-2.6.23-rc8/drivers/input/touchscreen/Kconfig
+@@ -67,6 +67,24 @@
  	  To compile this driver as a module, choose M here: the
- 	  module will be called corgi_ts.
+ 	  module will be called fujitsu-ts.
  
 +config TOUCHSCREEN_S3C2410
 +	tristate "Samsung S3C2410 touchscreen input driver"
@@ -115,19 +115,19 @@
  config TOUCHSCREEN_GUNZE
  	tristate "Gunze AHL-51S touchscreen"
  	select SERIO
-Index: linux-2.6.21-moko/drivers/input/touchscreen/Makefile
+Index: linux-2.6.23-rc8/drivers/input/touchscreen/Makefile
 ===================================================================
---- linux-2.6.21-moko.orig/drivers/input/touchscreen/Makefile
-+++ linux-2.6.21-moko/drivers/input/touchscreen/Makefile
-@@ -16,3 +16,4 @@
+--- linux-2.6.23-rc8.orig/drivers/input/touchscreen/Makefile
++++ linux-2.6.23-rc8/drivers/input/touchscreen/Makefile
+@@ -18,3 +18,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.21-moko/drivers/input/touchscreen/s3c2410_ts.c
+Index: linux-2.6.23-rc8/drivers/input/touchscreen/s3c2410_ts.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.21-moko/drivers/input/touchscreen/s3c2410_ts.c
++++ linux-2.6.23-rc8/drivers/input/touchscreen/s3c2410_ts.c
 @@ -0,0 +1,426 @@
 +/*
 + * This program is free software; you can redistribute it and/or modify
@@ -555,10 +555,10 @@
 +        c-basic-offset: 8
 +    End:
 +*/
-Index: linux-2.6.21-moko/include/asm-arm/arch-s3c2410/ts.h
+Index: linux-2.6.23-rc8/include/asm-arm/arch-s3c2410/ts.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.21-moko/include/asm-arm/arch-s3c2410/ts.h
++++ linux-2.6.23-rc8/include/asm-arm/arch-s3c2410/ts.h
 @@ -0,0 +1,28 @@
 +/* linux/include/asm/arch-s3c2410/ts.h
 + *
@@ -588,11 +588,11 @@
 +
 +#endif /* __ASM_ARM_TS_H */
 +
-Index: linux-2.6.21-moko/arch/arm/plat-s3c24xx/s3c244x.c
+Index: linux-2.6.23-rc8/arch/arm/plat-s3c24xx/s3c244x.c
 ===================================================================
---- linux-2.6.21-moko.orig/arch/arm/plat-s3c24xx/s3c244x.c
-+++ linux-2.6.21-moko/arch/arm/plat-s3c24xx/s3c244x.c
-@@ -68,6 +68,7 @@
+--- linux-2.6.23-rc8.orig/arch/arm/plat-s3c24xx/s3c244x.c
++++ linux-2.6.23-rc8/arch/arm/plat-s3c24xx/s3c244x.c
+@@ -67,6 +67,7 @@
  
  	s3c_device_i2c.name  = "s3c2440-i2c";
  	s3c_device_nand.name = "s3c2440-nand";

Modified: branches/src/target/kernel/2.6.23.x/patches/s3c2442b-cpuid.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/s3c2442b-cpuid.patch	2007-09-26 16:10:36 UTC (rev 3045)
+++ branches/src/target/kernel/2.6.23.x/patches/s3c2442b-cpuid.patch	2007-09-26 16:12:59 UTC (rev 3046)
@@ -1,23 +1,23 @@
 Add the Samsung S3C2442B CPU idcode to the samsung s3c24xx platform code
 and fix a Kconfig typo related tot the 2442.
 
-Index: linux-2.6.22.5-moko/arch/arm/mach-s3c2442/Kconfig
+Index: linux-2.6.23-rc8/arch/arm/mach-s3c2442/Kconfig
 ===================================================================
---- linux-2.6.22.5-moko.orig/arch/arm/mach-s3c2442/Kconfig
-+++ linux-2.6.22.5-moko/arch/arm/mach-s3c2442/Kconfig
+--- linux-2.6.23-rc8.orig/arch/arm/mach-s3c2442/Kconfig
++++ linux-2.6.23-rc8/arch/arm/mach-s3c2442/Kconfig
 @@ -6,7 +6,7 @@
  
  config CPU_S3C2442
  	bool
--	depends on ARCH_S3C2420
+-	depends on ARCH_S3C2410
 +	depends on ARCH_S3C2440
  	select S3C2410_CLOCK
  	select S3C2410_GPIO
  	select S3C2410_PM if PM
-Index: linux-2.6.22.5-moko/arch/arm/plat-s3c24xx/cpu.c
+Index: linux-2.6.23-rc8/arch/arm/plat-s3c24xx/cpu.c
 ===================================================================
---- linux-2.6.22.5-moko.orig/arch/arm/plat-s3c24xx/cpu.c
-+++ linux-2.6.22.5-moko/arch/arm/plat-s3c24xx/cpu.c
+--- linux-2.6.23-rc8.orig/arch/arm/plat-s3c24xx/cpu.c
++++ linux-2.6.23-rc8/arch/arm/plat-s3c24xx/cpu.c
 @@ -68,6 +68,7 @@
  static const char name_s3c2412[]  = "S3C2412";
  static const char name_s3c2440[]  = "S3C2440";

Modified: branches/src/target/kernel/2.6.23.x/patches/series
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/series	2007-09-26 16:10:36 UTC (rev 3045)
+++ branches/src/target/kernel/2.6.23.x/patches/series	2007-09-26 16:12:59 UTC (rev 3046)
@@ -1,4 +1,4 @@
-alsa-2.6.23-rc1-commit.diff
+#alsa-2.6.23-rc1-commit.dif (merged upstream)
 asoc-platform-hw_init-pcm_emulation-fix.patch
 asoc-kconfig-fix.patch
 missing_defs.patch
@@ -9,10 +9,10 @@
 g_ether-highpower.patch
 g_ether-vendor_product.patch
 s3c2410_serial-nodebug.patch
-s3c2410_udc_from_upstream.patch
+#s3c2410_udc_from_upstream.p (merged upstream)
 s3c2410_touchscreen.patch
 s3c2410-bbt.patch
-#udc-nomodule-misccr.patch
+#udc-nomodule-misccr.patch (already dropped for 2.6.22.x)
 s3c_mci.patch
 s3cmci_dbg.patch
 s3cmci-dma-free.patch

Modified: branches/src/target/kernel/2.6.23.x/patches/smedia-glamo.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/smedia-glamo.patch	2007-09-26 16:10:36 UTC (rev 3045)
+++ branches/src/target/kernel/2.6.23.x/patches/smedia-glamo.patch	2007-09-26 16:12:59 UTC (rev 3046)
@@ -1,10 +1,10 @@
-Index: linux-2.6.22.5-moko/drivers/video/Kconfig
+Index: linux-2.6.23-rc8/drivers/video/Kconfig
 ===================================================================
---- linux-2.6.22.5-moko.orig/drivers/video/Kconfig
-+++ linux-2.6.22.5-moko/drivers/video/Kconfig
-@@ -1820,6 +1820,38 @@
- 	  framebuffer. ML300 carries a 640*480 LCD display on the board,
- 	  ML403 uses a standard DB15 VGA connector.
+--- linux-2.6.23-rc8.orig/drivers/video/Kconfig
++++ linux-2.6.23-rc8/drivers/video/Kconfig
+@@ -1837,6 +1837,38 @@
+ 	source "drivers/video/omap/Kconfig"
+ endif
  
 +config GLAMO
 +	bool
@@ -41,22 +41,22 @@
  config FB_VIRTUAL
  	tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
  	depends on FB
-Index: linux-2.6.22.5-moko/drivers/video/Makefile
+Index: linux-2.6.23-rc8/drivers/video/Makefile
 ===================================================================
---- linux-2.6.22.5-moko.orig/drivers/video/Makefile
-+++ linux-2.6.22.5-moko/drivers/video/Makefile
+--- linux-2.6.23-rc8.orig/drivers/video/Makefile
++++ linux-2.6.23-rc8/drivers/video/Makefile
 @@ -113,6 +113,7 @@
- obj-$(CONFIG_FB_PS3)		  += ps3fb.o
  obj-$(CONFIG_FB_SM501)            += sm501fb.o
  obj-$(CONFIG_FB_XILINX)           += xilinxfb.o
-+obj-$(CONFIG_GLAMO)		  += glamo/
+ obj-$(CONFIG_FB_OMAP)             += omap/
++obj-$(CONFIG_GLAMO)               += glamo/
  
  # Platform or fallback drivers go here
  obj-$(CONFIG_FB_VESA)             += vesafb.o
-Index: linux-2.6.22.5-moko/drivers/video/glamo/Makefile
+Index: linux-2.6.23-rc8/drivers/video/glamo/Makefile
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/drivers/video/glamo/Makefile
++++ linux-2.6.23-rc8/drivers/video/glamo/Makefile
 @@ -0,0 +1,11 @@
 +#
 +# Makefile for the Smedia Glamo framebuffer driver
@@ -69,10 +69,10 @@
 +obj-$(CONFIG_FB_GLAMO)		+= glamo-fb.o
 +obj-$(CONFIG_FB_GLAMO_SPI)	+= glamo-lcm-spi.o
 +
-Index: linux-2.6.22.5-moko/drivers/video/glamo/glamo-regs.h
+Index: linux-2.6.23-rc8/drivers/video/glamo/glamo-regs.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/drivers/video/glamo/glamo-regs.h
++++ linux-2.6.23-rc8/drivers/video/glamo/glamo-regs.h
 @@ -0,0 +1,466 @@
 +#ifndef _GLAMO_REGS_H
 +#define _GLAMO_REGS_H
@@ -540,10 +540,10 @@
 +};
 +
 +#endif /* _GLAMO_REGS_H */
-Index: linux-2.6.22.5-moko/drivers/video/glamo/glamo-core.c
+Index: linux-2.6.23-rc8/drivers/video/glamo/glamo-core.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/drivers/video/glamo/glamo-core.c
++++ linux-2.6.23-rc8/drivers/video/glamo/glamo-core.c
 @@ -0,0 +1,1020 @@
 +/* Smedia Glamo 336x/337x driver
 + *
@@ -1565,10 +1565,10 @@
 +MODULE_AUTHOR("Harald Welte <laforge at openmoko.org>");
 +MODULE_DESCRIPTION("Smedia Glamo 336x/337x core/resource driver");
 +MODULE_LICENSE("GPL");
-Index: linux-2.6.22.5-moko/include/asm-arm/arch-s3c2410/irqs.h
+Index: linux-2.6.23-rc8/include/asm-arm/arch-s3c2410/irqs.h
 ===================================================================
---- linux-2.6.22.5-moko.orig/include/asm-arm/arch-s3c2410/irqs.h
-+++ linux-2.6.22.5-moko/include/asm-arm/arch-s3c2410/irqs.h
+--- linux-2.6.23-rc8.orig/include/asm-arm/arch-s3c2410/irqs.h
++++ linux-2.6.23-rc8/include/asm-arm/arch-s3c2410/irqs.h
 @@ -148,9 +148,37 @@
  #define IRQ_S3C2443_AC97	S3C2410_IRQSUB(28)
  
@@ -1609,10 +1609,10 @@
 +#define IRQ_GLAMO_RISC		IRQ_GLAMO(8)
 +
  #endif /* __ASM_ARCH_IRQ_H */
-Index: linux-2.6.22.5-moko/drivers/video/glamo/glamo-fb.c
+Index: linux-2.6.23-rc8/drivers/video/glamo/glamo-fb.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/drivers/video/glamo/glamo-fb.c
++++ linux-2.6.23-rc8/drivers/video/glamo/glamo-fb.c
 @@ -0,0 +1,627 @@
 +/* Smedia Glamo 336x/337x driver
 + *
@@ -2241,10 +2241,10 @@
 +MODULE_AUTHOR("Harald Welte <laforge at openmoko.org>");
 +MODULE_DESCRIPTION("Smedia Glamo 336x/337x framebuffer driver");
 +MODULE_LICENSE("GPL");
-Index: linux-2.6.22.5-moko/include/linux/glamofb.h
+Index: linux-2.6.23-rc8/include/linux/glamofb.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/include/linux/glamofb.h
++++ linux-2.6.23-rc8/include/linux/glamofb.h
 @@ -0,0 +1,29 @@
 +#ifndef _LINUX_GLAMOFB_H
 +#define _LINUX_GLAMOFB_H
@@ -2275,10 +2275,10 @@
 +int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val);
 +
 +#endif
-Index: linux-2.6.22.5-moko/include/linux/spi/glamo.h
+Index: linux-2.6.23-rc8/include/linux/spi/glamo.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/include/linux/spi/glamo.h
++++ linux-2.6.23-rc8/include/linux/spi/glamo.h
 @@ -0,0 +1,28 @@
 +#ifndef __GLAMO_SPI_H
 +#define __GLAMO_SPI_H
@@ -2308,10 +2308,10 @@
 +
 +
 +#endif
-Index: linux-2.6.22.5-moko/drivers/video/glamo/glamo-core.h
+Index: linux-2.6.23-rc8/drivers/video/glamo/glamo-core.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/drivers/video/glamo/glamo-core.h
++++ linux-2.6.23-rc8/drivers/video/glamo/glamo-core.h
 @@ -0,0 +1,51 @@
 +#ifndef __GLAMO_CORE_H
 +#define __GLAMO_CORE_H
@@ -2364,10 +2364,10 @@
 +void glamo_engine_reset(struct glamo_core *glamo, enum glamo_engine engine);
 +
 +#endif /* __GLAMO_CORE_H */
-Index: linux-2.6.22.5-moko/drivers/video/glamo/glamo-gpio.c
+Index: linux-2.6.23-rc8/drivers/video/glamo/glamo-gpio.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/drivers/video/glamo/glamo-gpio.c
++++ linux-2.6.23-rc8/drivers/video/glamo/glamo-gpio.c
 @@ -0,0 +1,62 @@
 +
 +#include <linux/kernel.h>
@@ -2431,10 +2431,10 @@
 +}
 +EXPORT_SYMBOL(glamo_gpio_cfgpin);
 +
-Index: linux-2.6.22.5-moko/drivers/video/glamo/glamo-lcm-spi.c
+Index: linux-2.6.23-rc8/drivers/video/glamo/glamo-lcm-spi.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/drivers/video/glamo/glamo-lcm-spi.c
++++ linux-2.6.23-rc8/drivers/video/glamo/glamo-lcm-spi.c
 @@ -0,0 +1,241 @@
 +/*
 + * Copyright (C) 2007 OpenMoko, Inc.
@@ -2677,10 +2677,10 @@
 +MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver");
 +MODULE_AUTHOR("Harald Welte <laforge at openmoko.org>")
 +MODULE_LICENSE("GPL");
-Index: linux-2.6.22.5-moko/drivers/video/glamo/glamo-spi-gpio.c
+Index: linux-2.6.23-rc8/drivers/video/glamo/glamo-spi-gpio.c
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/drivers/video/glamo/glamo-spi-gpio.c
++++ linux-2.6.23-rc8/drivers/video/glamo/glamo-spi-gpio.c
 @@ -0,0 +1,250 @@
 +/*
 + * Copyright (C) 2007 OpenMoko, Inc.
@@ -2932,10 +2932,10 @@
 +MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver");
 +MODULE_AUTHOR("Harald Welte <laforge at openmoko.org>")
 +MODULE_LICENSE("GPL");
-Index: linux-2.6.22.5-moko/include/linux/glamo-gpio.h
+Index: linux-2.6.23-rc8/include/linux/glamo-gpio.h
 ===================================================================
 --- /dev/null
-+++ linux-2.6.22.5-moko/include/linux/glamo-gpio.h
++++ linux-2.6.23-rc8/include/linux/glamo-gpio.h
 @@ -0,0 +1,98 @@
 +#ifndef __GLAMO_GPIO_H
 +#define __GLAMO_GPIO_H

Modified: branches/src/target/kernel/2.6.23.x/patches/yaffs2-20070905.patch
===================================================================
--- branches/src/target/kernel/2.6.23.x/patches/yaffs2-20070905.patch	2007-09-26 16:10:36 UTC (rev 3045)
+++ branches/src/target/kernel/2.6.23.x/patches/yaffs2-20070905.patch	2007-09-26 16:12:59 UTC (rev 3046)
@@ -1,7 +1,8 @@
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/Kconfig linux-2.6.22.5-yaffs2/fs/Kconfig
---- linux-2.6.22.5/fs/Kconfig	2007-09-05 14:34:08.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/Kconfig	2007-09-05 14:36:21.000000000 +0800
-@@ -1185,6 +1185,10 @@
+Index: linux-2.6.23-rc8/fs/Kconfig
+===================================================================
+--- linux-2.6.23-rc8.orig/fs/Kconfig
++++ linux-2.6.23-rc8/fs/Kconfig
+@@ -1182,6 +1182,10 @@
  	  To compile the EFS file system support as a module, choose M here: the
  	  module will be called efs.
  
@@ -12,9 +13,10 @@
  config JFFS2_FS
  	tristate "Journalling Flash File System v2 (JFFS2) support"
  	select CRC32
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/devextras.h linux-2.6.22.5-yaffs2/fs/yaffs2/devextras.h
---- linux-2.6.22.5/fs/yaffs2/devextras.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/devextras.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/devextras.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/devextras.h
 @@ -0,0 +1,264 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
@@ -280,9 +282,10 @@
 +#endif
 +
 +#endif
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/Kconfig linux-2.6.22.5-yaffs2/fs/yaffs2/Kconfig
---- linux-2.6.22.5/fs/yaffs2/Kconfig	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/Kconfig	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/Kconfig
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/Kconfig
 @@ -0,0 +1,176 @@
 +#
 +# YAFFS file system configurations
@@ -460,9 +463,10 @@
 +	  but makes look-ups faster.
 +
 +	  If unsure, say Y.
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/Makefile linux-2.6.22.5-yaffs2/fs/yaffs2/Makefile
---- linux-2.6.22.5/fs/yaffs2/Makefile	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/Makefile	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/Makefile
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/Makefile
 @@ -0,0 +1,10 @@
 +#
 +# Makefile for the linux YAFFS filesystem routines.
@@ -474,9 +478,10 @@
 +yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o yaffs_qsort.o
 +yaffs-y += yaffs_tagscompat.o yaffs_tagsvalidity.o
 +yaffs-y += yaffs_mtdif.o yaffs_mtdif1.o yaffs_mtdif2.o
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/moduleconfig.h linux-2.6.22.5-yaffs2/fs/yaffs2/moduleconfig.h
---- linux-2.6.22.5/fs/yaffs2/moduleconfig.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/moduleconfig.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/moduleconfig.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/moduleconfig.h
 @@ -0,0 +1,65 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
@@ -543,9 +548,10 @@
 +#endif /* YAFFS_OUT_OF_TREE */
 +
 +#endif /* __YAFFS_CONFIG_H__ */
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_checkptrw.c linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_checkptrw.c
---- linux-2.6.22.5/fs/yaffs2/yaffs_checkptrw.c	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_checkptrw.c	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_checkptrw.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_checkptrw.c
 @@ -0,0 +1,404 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -951,9 +957,10 @@
 +
 +
 +
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_checkptrw.h linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_checkptrw.h
---- linux-2.6.22.5/fs/yaffs2/yaffs_checkptrw.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_checkptrw.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_checkptrw.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_checkptrw.h
 @@ -0,0 +1,35 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
@@ -990,9 +997,10 @@
 +
 +#endif
 +
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_ecc.c linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_ecc.c
---- linux-2.6.22.5/fs/yaffs2/yaffs_ecc.c	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_ecc.c	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_ecc.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_ecc.c
 @@ -0,0 +1,331 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -1325,9 +1333,10 @@
 +
 +}
 +
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_ecc.h linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_ecc.h
---- linux-2.6.22.5/fs/yaffs2/yaffs_ecc.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_ecc.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_ecc.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_ecc.h
 @@ -0,0 +1,44 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
@@ -1373,9 +1382,10 @@
 +			  yaffs_ECCOther * read_ecc,
 +			  const yaffs_ECCOther * test_ecc);
 +#endif
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_fs.c linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_fs.c
---- linux-2.6.22.5/fs/yaffs2/yaffs_fs.c	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_fs.c	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_fs.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_fs.c
 @@ -0,0 +1,2276 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -3653,9 +3663,10 @@
 +MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system");
 +MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2006");
 +MODULE_LICENSE("GPL");
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_guts.c linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_guts.c
---- linux-2.6.22.5/fs/yaffs2/yaffs_guts.c	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_guts.c	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_guts.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_guts.c
 @@ -0,0 +1,7474 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -11131,9 +11142,10 @@
 +
 +	    return YAFFS_OK;
 +}
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_guts.h linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_guts.h
---- linux-2.6.22.5/fs/yaffs2/yaffs_guts.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_guts.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_guts.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_guts.h
 @@ -0,0 +1,902 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
@@ -12037,9 +12049,10 @@
 +void yaffs_HandleChunkError(yaffs_Device *dev, yaffs_BlockInfo *bi);
 +
 +#endif
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffsinterface.h linux-2.6.22.5-yaffs2/fs/yaffs2/yaffsinterface.h
---- linux-2.6.22.5/fs/yaffs2/yaffsinterface.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffsinterface.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffsinterface.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffsinterface.h
 @@ -0,0 +1,21 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
@@ -12062,9 +12075,10 @@
 +int yaffs_Initialise(unsigned nBlocks);
 +
 +#endif
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_mtdif1.c linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_mtdif1.c
---- linux-2.6.22.5/fs/yaffs2/yaffs_mtdif1.c	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_mtdif1.c	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_mtdif1.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_mtdif1.c
 @@ -0,0 +1,363 @@
 +/*
 + * YAFFS: Yet another FFS. A NAND-flash specific file system.
@@ -12429,9 +12443,10 @@
 +}
 +
 +#endif /*KERNEL_VERSION*/
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_mtdif1.h linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_mtdif1.h
---- linux-2.6.22.5/fs/yaffs2/yaffs_mtdif1.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_mtdif1.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_mtdif1.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_mtdif1.h
 @@ -0,0 +1,28 @@
 +/*
 + * YAFFS: Yet another Flash File System. A NAND-flash specific file system.
@@ -12461,9 +12476,10 @@
 +	yaffs_BlockState * state, int *sequenceNumber);
 +
 +#endif
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_mtdif2.c linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_mtdif2.c
---- linux-2.6.22.5/fs/yaffs2/yaffs_mtdif2.c	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_mtdif2.c	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_mtdif2.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_mtdif2.c
 @@ -0,0 +1,232 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -12697,9 +12713,10 @@
 +		return YAFFS_FAIL;
 +}
 +
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_mtdif2.h linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_mtdif2.h
---- linux-2.6.22.5/fs/yaffs2/yaffs_mtdif2.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_mtdif2.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_mtdif2.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_mtdif2.h
 @@ -0,0 +1,29 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
@@ -12730,9 +12747,10 @@
 +			    yaffs_BlockState * state, int *sequenceNumber);
 +
 +#endif
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_mtdif.c linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_mtdif.c
---- linux-2.6.22.5/fs/yaffs2/yaffs_mtdif.c	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_mtdif.c	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_mtdif.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_mtdif.c
 @@ -0,0 +1,241 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -12975,9 +12993,10 @@
 +	return YAFFS_OK;
 +}
 +
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_mtdif.h linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_mtdif.h
---- linux-2.6.22.5/fs/yaffs2/yaffs_mtdif.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_mtdif.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_mtdif.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_mtdif.h
 @@ -0,0 +1,27 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
@@ -13006,9 +13025,10 @@
 +int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber);
 +int nandmtd_InitialiseNAND(yaffs_Device * dev);
 +#endif
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_nand.c linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_nand.c
---- linux-2.6.22.5/fs/yaffs2/yaffs_nand.c	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_nand.c	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_nand.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_nand.c
 @@ -0,0 +1,134 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -13144,9 +13164,10 @@
 +
 +
 + 
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_nandemul2k.h linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_nandemul2k.h
---- linux-2.6.22.5/fs/yaffs2/yaffs_nandemul2k.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_nandemul2k.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_nandemul2k.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_nandemul2k.h
 @@ -0,0 +1,39 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
@@ -13187,9 +13208,10 @@
 +int nandemul2k_GetNumberOfBlocks(void);
 +
 +#endif
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_nand.h linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_nand.h
---- linux-2.6.22.5/fs/yaffs2/yaffs_nand.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_nand.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_nand.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_nand.h
 @@ -0,0 +1,44 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
@@ -13235,9 +13257,10 @@
 +
 +#endif
 +
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_packedtags1.c linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_packedtags1.c
---- linux-2.6.22.5/fs/yaffs2/yaffs_packedtags1.c	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_packedtags1.c	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_packedtags1.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_packedtags1.c
 @@ -0,0 +1,52 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -13291,9 +13314,10 @@
 +
 +	}
 +}
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_packedtags1.h linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_packedtags1.h
---- linux-2.6.22.5/fs/yaffs2/yaffs_packedtags1.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_packedtags1.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_packedtags1.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_packedtags1.h
 @@ -0,0 +1,37 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
@@ -13332,9 +13356,10 @@
 +void yaffs_PackTags1(yaffs_PackedTags1 * pt, const yaffs_ExtendedTags * t);
 +void yaffs_UnpackTags1(yaffs_ExtendedTags * t, const yaffs_PackedTags1 * pt);
 +#endif
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_packedtags2.c linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_packedtags2.c
---- linux-2.6.22.5/fs/yaffs2/yaffs_packedtags2.c	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_packedtags2.c	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_packedtags2.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_packedtags2.c
 @@ -0,0 +1,182 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -13518,9 +13543,10 @@
 +	yaffs_DumpTags2(t);
 +
 +}
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_packedtags2.h linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_packedtags2.h
---- linux-2.6.22.5/fs/yaffs2/yaffs_packedtags2.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_packedtags2.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_packedtags2.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_packedtags2.h
 @@ -0,0 +1,38 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
@@ -13560,9 +13586,10 @@
 +void yaffs_PackTags2(yaffs_PackedTags2 * pt, const yaffs_ExtendedTags * t);
 +void yaffs_UnpackTags2(yaffs_ExtendedTags * t, yaffs_PackedTags2 * pt);
 +#endif
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_qsort.c linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_qsort.c
---- linux-2.6.22.5/fs/yaffs2/yaffs_qsort.c	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_qsort.c	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_qsort.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_qsort.c
 @@ -0,0 +1,160 @@
 +/*
 + * Copyright (c) 1992, 1993
@@ -13724,9 +13751,10 @@
 +	}
 +/*		yaffs_qsort(pn - r, r / es, es, cmp);*/
 +}
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_qsort.h linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_qsort.h
---- linux-2.6.22.5/fs/yaffs2/yaffs_qsort.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_qsort.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_qsort.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_qsort.h
 @@ -0,0 +1,23 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
@@ -13751,9 +13779,10 @@
 +                   int (*cmp)(const void *, const void *));
 +
 +#endif
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_tagscompat.c linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_tagscompat.c
---- linux-2.6.22.5/fs/yaffs2/yaffs_tagscompat.c	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_tagscompat.c	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_tagscompat.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_tagscompat.c
 @@ -0,0 +1,530 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -14285,9 +14314,10 @@
 +
 +	return YAFFS_OK;
 +}
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_tagscompat.h linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_tagscompat.h
---- linux-2.6.22.5/fs/yaffs2/yaffs_tagscompat.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_tagscompat.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_tagscompat.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_tagscompat.h
 @@ -0,0 +1,40 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
@@ -14329,9 +14359,10 @@
 +int yaffs_CountBits(__u8 byte);
 +
 +#endif
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_tagsvalidity.c linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_tagsvalidity.c
---- linux-2.6.22.5/fs/yaffs2/yaffs_tagsvalidity.c	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_tagsvalidity.c	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_tagsvalidity.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_tagsvalidity.c
 @@ -0,0 +1,28 @@
 +/*
 + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
@@ -14361,9 +14392,10 @@
 +		tags->validMarker1 == 0x55555555);
 +
 +}
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yaffs_tagsvalidity.h linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_tagsvalidity.h
---- linux-2.6.22.5/fs/yaffs2/yaffs_tagsvalidity.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yaffs_tagsvalidity.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yaffs_tagsvalidity.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yaffs_tagsvalidity.h
 @@ -0,0 +1,24 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
@@ -14389,9 +14421,10 @@
 +void yaffs_InitialiseTags(yaffs_ExtendedTags * tags);
 +int yaffs_ValidateTags(yaffs_ExtendedTags * tags);
 +#endif
-diff -Nru --exclude '*.pre.yaffs' linux-2.6.22.5/fs/yaffs2/yportenv.h linux-2.6.22.5-yaffs2/fs/yaffs2/yportenv.h
---- linux-2.6.22.5/fs/yaffs2/yportenv.h	1970-01-01 08:00:00.000000000 +0800
-+++ linux-2.6.22.5-yaffs2/fs/yaffs2/yportenv.h	2007-09-05 14:36:21.000000000 +0800
+Index: linux-2.6.23-rc8/fs/yaffs2/yportenv.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23-rc8/fs/yaffs2/yportenv.h
 @@ -0,0 +1,186 @@
 +/*
 + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 





More information about the commitlog mailing list