5 files changed, 17 insertions, 22 deletions
diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile
index f285c2c16..33dfa9a43 100644
--- a/target/linux/at91/Makefile
+++ b/target/linux/at91/Makefile
@@ -14,7 +14,7 @@ FEATURES:=squashfs jffs2 targz
 CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves
 SUBTARGETS:=netus tqma9263
 
-LINUX_VERSION:=2.6.38.2
+LINUX_VERSION:=2.6.38.6
 DEVICE_TYPE=
 
 include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/at91/patches/100-at91_i2c.patch b/target/linux/at91/patches/100-at91_i2c.patch
index 009feb84e..e78ffde08 100644
--- a/target/linux/at91/patches/100-at91_i2c.patch
+++ b/target/linux/at91/patches/100-at91_i2c.patch
@@ -1,6 +1,6 @@
 --- a/drivers/i2c/busses/Kconfig
 +++ b/drivers/i2c/busses/Kconfig
-@@ -282,7 +282,7 @@ comment "I2C system bus drivers (mostly
+@@ -283,7 +283,7 @@ comment "I2C system bus drivers (mostly
  
  config I2C_AT91
  	tristate "Atmel AT91 I2C Two-Wire interface (TWI)"
diff --git a/target/linux/at91/patches/200-experimenta_adc_driver.patch b/target/linux/at91/patches/200-experimenta_adc_driver.patch
index 625b37797..48bb61e36 100644
--- a/target/linux/at91/patches/200-experimenta_adc_driver.patch
+++ b/target/linux/at91/patches/200-experimenta_adc_driver.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.38/drivers/misc/Kconfig
-===================================================================
---- linux-2.6.38.orig/drivers/misc/Kconfig	2011-03-15 02:20:32.000000000 +0100
-+++ linux-2.6.38/drivers/misc/Kconfig	2011-03-20 22:54:33.114794033 +0100
-@@ -104,6 +104,10 @@
+--- a/drivers/misc/Kconfig
++++ b/drivers/misc/Kconfig
+@@ -104,6 +104,10 @@ config ATMEL_TCB_CLKSRC_BLOCK
  	  TC can be used for other purposes, such as PWM generation and
  	  interval timing.
  
@@ -13,11 +11,9 @@ Index: linux-2.6.38/drivers/misc/Kconfig
  config IBM_ASM
  	tristate "Device driver for IBM RSA service processor"
  	depends on X86 && PCI && INPUT && EXPERIMENTAL
-Index: linux-2.6.38/drivers/misc/Makefile
-===================================================================
---- linux-2.6.38.orig/drivers/misc/Makefile	2011-03-15 02:20:32.000000000 +0100
-+++ linux-2.6.38/drivers/misc/Makefile	2011-03-20 22:55:18.000000000 +0100
-@@ -9,6 +9,7 @@
+--- a/drivers/misc/Makefile
++++ b/drivers/misc/Makefile
+@@ -9,6 +9,7 @@ obj-$(CONFIG_AD525X_DPOT_SPI)	+= ad525x_
  obj-$(CONFIG_ATMEL_PWM)		+= atmel_pwm.o
  obj-$(CONFIG_ATMEL_SSC)		+= atmel-ssc.o
  obj-$(CONFIG_ATMEL_TCLIB)	+= atmel_tclib.o
@@ -25,4 +21,3 @@ Index: linux-2.6.38/drivers/misc/Makefile
  obj-$(CONFIG_BMP085)		+= bmp085.o
  obj-$(CONFIG_ICS932S401)	+= ics932s401.o
  obj-$(CONFIG_LKDTM)		+= lkdtm.o
-
diff --git a/target/linux/at91/patches/600-usb_vbus_active_high.patch b/target/linux/at91/patches/600-usb_vbus_active_high.patch
index 0a55ac69a..08dfcb303 100644
--- a/target/linux/at91/patches/600-usb_vbus_active_high.patch
+++ b/target/linux/at91/patches/600-usb_vbus_active_high.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-at91/at91cap9_devices.c
 +++ b/arch/arm/mach-at91/at91cap9_devices.c
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ void __init at91_add_device_usbh(struct
  	/* Enable VBus control for UHP ports */
  	for (i = 0; i < data->ports; i++) {
  		if (data->vbus_pin[i])
@@ -11,7 +11,7 @@
  	usbh_data = *data;
 --- a/arch/arm/mach-at91/at91sam9263_devices.c
 +++ b/arch/arm/mach-at91/at91sam9263_devices.c
-@@ -71,7 +71,7 @@
+@@ -71,7 +71,7 @@ void __init at91_add_device_usbh(struct
  	/* Enable VBus control for UHP ports */
  	for (i = 0; i < data->ports; i++) {
  		if (data->vbus_pin[i])
@@ -22,7 +22,7 @@
  	usbh_data = *data;
 --- a/arch/arm/mach-at91/at91sam9g45_devices.c
 +++ b/arch/arm/mach-at91/at91sam9g45_devices.c
-@@ -119,7 +119,7 @@
+@@ -121,7 +121,7 @@ void __init at91_add_device_usbh_ohci(st
  	/* Enable VBus control for UHP ports */
  	for (i = 0; i < data->ports; i++) {
  		if (data->vbus_pin[i])
@@ -31,7 +31,7 @@
  	}
  
  	usbh_ohci_data = *data;
-@@ -174,7 +174,7 @@
+@@ -176,7 +176,7 @@ void __init at91_add_device_usbh_ehci(st
  	/* Enable VBus control for UHP ports */
  	for (i = 0; i < data->ports; i++) {
  		if (data->vbus_pin[i])
@@ -42,7 +42,7 @@
  	usbh_ehci_data = *data;
 --- a/arch/arm/mach-at91/include/mach/board.h
 +++ b/arch/arm/mach-at91/include/mach/board.h
-@@ -93,8 +93,9 @@
+@@ -96,8 +96,9 @@ extern void __init at91_add_device_eth(s
  
   /* USB Host */
  struct at91_usbh_data {
@@ -56,7 +56,7 @@
  extern void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data);
 --- a/drivers/usb/host/ohci-at91.c
 +++ b/drivers/usb/host/ohci-at91.c
-@@ -277,14 +277,13 @@
+@@ -277,14 +277,13 @@ static int ohci_hcd_at91_drv_probe(struc
  	if (pdata) {
  		/* REVISIT make the driver support per-port power switching,
  		 * and also overcurrent detection.  Here we assume the ports
@@ -73,7 +73,7 @@
  		}
  	}
  
-@@ -301,7 +300,7 @@
+@@ -301,7 +300,7 @@ static int ohci_hcd_at91_drv_remove(stru
  		for (i = 0; i < ARRAY_SIZE(pdata->vbus_pin); i++) {
  			if (pdata->vbus_pin[i] <= 0)
  				continue;
diff --git a/target/linux/at91/patches/700-tqma9263-support.patch b/target/linux/at91/patches/700-tqma9263-support.patch
index 941b4a665..649d0d77d 100644
--- a/target/linux/at91/patches/700-tqma9263-support.patch
+++ b/target/linux/at91/patches/700-tqma9263-support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-at91/Kconfig
 +++ b/arch/arm/mach-at91/Kconfig
-@@ -317,6 +317,12 @@
+@@ -318,6 +318,12 @@ config MACH_NEOCORE926
  	help
  	  Select this if you are using the Adeneo Neocore 926 board.
  
@@ -15,7 +15,7 @@
  # ----------------------------------------------------------
 --- a/arch/arm/mach-at91/Makefile
 +++ b/arch/arm/mach-at91/Makefile
-@@ -55,6 +55,7 @@
+@@ -56,6 +56,7 @@ obj-$(CONFIG_MACH_AT91SAM9G10EK) += boar
  obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o
  obj-$(CONFIG_MACH_USB_A9263)	+= board-usb-a9263.o
  obj-$(CONFIG_MACH_NEOCORE926)	+= board-neocore926.o