Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	package/freeradius-server/Makefile
	package/nss/patches/patch-mozilla_security_coreconf_Linux_mk

3 files changed, 85 insertions, 70 deletions

diff --git a/target/foxboard/kernel.config b/target/foxboard/kernel.config
index baf4cdef1..3e8cad3fa 100644
--- a/target/foxboard/kernel.config
+++ b/target/foxboard/kernel.config
@@ -1,12 +1,13 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34
-# Fri Jul 30 12:07:37 2010
+# Linux kernel version: 2.6.35.7
+# Thu Oct 14 18:47:53 2010
 #
 CONFIG_MMU=y
 CONFIG_ZONE_DMA=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_ARCH_USES_GETTIMEOFFSET=y
 CONFIG_GENERIC_IOMAP=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -27,6 +28,7 @@ CONFIG_CONSTRUCTORS=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
@@ -265,6 +267,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
+# CONFIG_L2TP is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_NET_DSA is not set
 # CONFIG_VLAN_8021Q is not set
@@ -297,9 +300,14 @@ CONFIG_WIRELESS=y
 #
 # CFG80211 needs to be enabled for MAC80211
 #
+
+#
+# Some wireless drivers require a rate control algorithm
+#
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
+# CONFIG_CAIF is not set
 
 #
 # Drivers for built-in interfaces
@@ -385,6 +393,7 @@ CONFIG_MTD_BLOCK_RO=y
 # CONFIG_INFTL is not set
 # CONFIG_RFD_FTL is not set
 # CONFIG_SSFDC is not set
+# CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
 
 #
@@ -538,6 +547,7 @@ CONFIG_USB_CATC=m
 # CONFIG_VT is not set
 # CONFIG_DEVKMEM is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_N_GSM is not set
 
 #
 # Serial drivers
@@ -548,6 +558,8 @@ CONFIG_USB_CATC=m
 # Non-8250 serial port support
 #
 # CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
 CONFIG_UNIX98_PTYS=y
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 # CONFIG_LEGACY_PTYS is not set
@@ -562,6 +574,7 @@ CONFIG_UNIX98_PTYS=y
 #
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
+# CONFIG_RAMOOPS is not set
 
 #
 # File systems
@@ -629,6 +642,7 @@ CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_LOGFS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_XATTRS is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
@@ -648,6 +662,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_NLS is not set
 # CONFIG_DLM is not set
+# CONFIG_SOUND is not set
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_ARCH_HAS_HCD is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -753,6 +768,7 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_SAMPLES is not set
 
 #
diff --git a/target/foxboard/patches/cris.patch b/target/foxboard/patches/cris.patch
index 1a4e109e5..44080f353 100644
--- a/target/foxboard/patches/cris.patch
+++ b/target/foxboard/patches/cris.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.34/arch/cris/arch-v10/drivers/axisflashmap.c
---- linux-2.6.34.orig/arch/cris/arch-v10/drivers/axisflashmap.c	2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/arch/cris/arch-v10/drivers/axisflashmap.c	2010-05-25 19:41:49.324723145 +0200
+diff -Nur linux-2.6.35.7.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.35.7/arch/cris/arch-v10/drivers/axisflashmap.c
+--- linux-2.6.35.7.orig/arch/cris/arch-v10/drivers/axisflashmap.c	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/cris/arch-v10/drivers/axisflashmap.c	2010-10-14 18:50:17.226851039 +0200
 @@ -113,7 +113,7 @@
  
  /* If no partition-table was found, we use this default-set. */
@@ -146,18 +146,18 @@ diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.
  	return err;
  }
  
-diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.34/arch/cris/arch-v10/drivers/ds1302.c
---- linux-2.6.34.orig/arch/cris/arch-v10/drivers/ds1302.c	2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/arch/cris/arch-v10/drivers/ds1302.c	2010-05-25 19:41:49.361720375 +0200
-@@ -21,6 +21,7 @@
- #include <linux/delay.h>
+diff -Nur linux-2.6.35.7.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.35.7/arch/cris/arch-v10/drivers/ds1302.c
+--- linux-2.6.35.7.orig/arch/cris/arch-v10/drivers/ds1302.c	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/cris/arch-v10/drivers/ds1302.c	2010-10-14 18:50:17.256851069 +0200
+@@ -22,6 +22,7 @@
+ #include <linux/smp_lock.h>
  #include <linux/bcd.h>
  #include <linux/capability.h>
 +#include <linux/device.h>
  
  #include <asm/uaccess.h>
  #include <asm/system.h>
-@@ -489,6 +490,10 @@
+@@ -499,6 +500,10 @@
  	return 0;
  }
  
@@ -168,7 +168,7 @@ diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.34/arc
  static int __init ds1302_register(void)
  {
  	ds1302_init();
-@@ -497,6 +502,12 @@
+@@ -507,6 +512,12 @@
  		       ds1302_name, RTC_MAJOR_NR);
  		return -1;
  	}
@@ -181,9 +181,9 @@ diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.34/arc
          return 0;
  
  }
-diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.34/arch/cris/arch-v10/drivers/gpio.c
---- linux-2.6.34.orig/arch/cris/arch-v10/drivers/gpio.c	2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/arch/cris/arch-v10/drivers/gpio.c	2010-05-25 19:41:49.427216846 +0200
+diff -Nur linux-2.6.35.7.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.35.7/arch/cris/arch-v10/drivers/gpio.c
+--- linux-2.6.35.7.orig/arch/cris/arch-v10/drivers/gpio.c	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/cris/arch-v10/drivers/gpio.c	2010-10-14 18:50:17.298091976 +0200
 @@ -21,6 +21,7 @@
  #include <linux/poll.h>
  #include <linux/init.h>
@@ -217,18 +217,18 @@ diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.34/arch/
  	/* Clear all leds */
  #if defined (CONFIG_ETRAX_CSP0_LEDS) ||  defined (CONFIG_ETRAX_PA_LEDS) || defined (CONFIG_ETRAX_PB_LEDS)
  	CRIS_LED_NETWORK_SET(0);
-diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/lib/hw_settings.S linux-2.6.34/arch/cris/arch-v10/lib/hw_settings.S
---- linux-2.6.34.orig/arch/cris/arch-v10/lib/hw_settings.S	2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/arch/cris/arch-v10/lib/hw_settings.S	2010-05-25 19:41:49.485343082 +0200
-@@ -60,3 +60,5 @@
+diff -Nur linux-2.6.35.7.orig/arch/cris/arch-v10/lib/hw_settings.S linux-2.6.35.7/arch/cris/arch-v10/lib/hw_settings.S
+--- linux-2.6.35.7.orig/arch/cris/arch-v10/lib/hw_settings.S	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/cris/arch-v10/lib/hw_settings.S	2010-10-14 18:50:17.338092197 +0200
+@@ -58,3 +58,5 @@
  	.dword R_PORT_PB_SET
  	.dword PB_SET_VALUE
  	.dword 0 ; No more register values
 +	.ascii "ACME_PART_MAGIC" 
 +	.dword 0xdeadc0de
-diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/mm/init.c linux-2.6.34/arch/cris/arch-v10/mm/init.c
---- linux-2.6.34.orig/arch/cris/arch-v10/mm/init.c	2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/arch/cris/arch-v10/mm/init.c	2010-05-25 19:41:49.522223225 +0200
+diff -Nur linux-2.6.35.7.orig/arch/cris/arch-v10/mm/init.c linux-2.6.35.7/arch/cris/arch-v10/mm/init.c
+--- linux-2.6.35.7.orig/arch/cris/arch-v10/mm/init.c	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/cris/arch-v10/mm/init.c	2010-10-14 18:50:17.378091957 +0200
 @@ -184,6 +184,9 @@
  
  	free_area_init_node(0, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0);
@@ -239,9 +239,9 @@ diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/mm/init.c linux-2.6.34/arch/cris/
  
  /* Initialize remaps of some I/O-ports. It is important that this
   * is called before any driver is initialized.
-diff -Nur linux-2.6.34.orig/arch/cris/boot/compressed/Makefile linux-2.6.34/arch/cris/boot/compressed/Makefile
---- linux-2.6.34.orig/arch/cris/boot/compressed/Makefile	2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/arch/cris/boot/compressed/Makefile	2010-05-25 19:41:49.562223178 +0200
+diff -Nur linux-2.6.35.7.orig/arch/cris/boot/compressed/Makefile linux-2.6.35.7/arch/cris/boot/compressed/Makefile
+--- linux-2.6.35.7.orig/arch/cris/boot/compressed/Makefile	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/cris/boot/compressed/Makefile	2010-10-14 18:50:17.418092209 +0200
 @@ -18,7 +18,7 @@
  OBJECTS-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o
  OBJECTS-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o
@@ -251,9 +251,9 @@ diff -Nur linux-2.6.34.orig/arch/cris/boot/compressed/Makefile linux-2.6.34/arch
  
  quiet_cmd_image = BUILD   $@
  cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
-diff -Nur linux-2.6.34.orig/arch/cris/boot/compressed/misc.c linux-2.6.34/arch/cris/boot/compressed/misc.c
---- linux-2.6.34.orig/arch/cris/boot/compressed/misc.c	2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/arch/cris/boot/compressed/misc.c	2010-05-25 19:41:49.602223136 +0200
+diff -Nur linux-2.6.35.7.orig/arch/cris/boot/compressed/misc.c linux-2.6.35.7/arch/cris/boot/compressed/misc.c
+--- linux-2.6.35.7.orig/arch/cris/boot/compressed/misc.c	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/cris/boot/compressed/misc.c	2010-10-14 18:50:17.448101099 +0200
 @@ -106,7 +106,7 @@
  
  static void flush_window(void);
@@ -304,9 +304,9 @@ diff -Nur linux-2.6.34.orig/arch/cris/boot/compressed/misc.c linux-2.6.34/arch/c
 -	puts("Done. Now booting the kernel\n");
 +	putstr("Done. Now booting the kernel\n");
  }
-diff -Nur linux-2.6.34.orig/arch/cris/boot/Makefile linux-2.6.34/arch/cris/boot/Makefile
---- linux-2.6.34.orig/arch/cris/boot/Makefile	2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/arch/cris/boot/Makefile	2010-05-25 19:41:49.642223132 +0200
+diff -Nur linux-2.6.35.7.orig/arch/cris/boot/Makefile linux-2.6.35.7/arch/cris/boot/Makefile
+--- linux-2.6.35.7.orig/arch/cris/boot/Makefile	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/cris/boot/Makefile	2010-10-14 18:50:17.494356449 +0200
 @@ -5,7 +5,7 @@
  objcopyflags-$(CONFIG_ETRAX_ARCH_V10) += -R .note -R .comment
  objcopyflags-$(CONFIG_ETRAX_ARCH_V32) += --remove-section=.bss
@@ -324,10 +324,10 @@ diff -Nur linux-2.6.34.orig/arch/cris/boot/Makefile linux-2.6.34/arch/cris/boot/
  
  $(obj)/zImage:  $(obj)/compressed/vmlinux
  	@cp $< $@
-diff -Nur linux-2.6.34.orig/arch/cris/Kconfig linux-2.6.34/arch/cris/Kconfig
---- linux-2.6.34.orig/arch/cris/Kconfig	2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/arch/cris/Kconfig	2010-05-25 19:41:49.692223112 +0200
-@@ -174,6 +174,12 @@
+diff -Nur linux-2.6.35.7.orig/arch/cris/Kconfig linux-2.6.35.7/arch/cris/Kconfig
+--- linux-2.6.35.7.orig/arch/cris/Kconfig	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/cris/Kconfig	2010-10-14 18:50:17.535601072 +0200
+@@ -177,6 +177,12 @@
  	help
  	  Size of DRAM (decimal in MB) typically 2, 8 or 16.
  
@@ -340,7 +340,7 @@ diff -Nur linux-2.6.34.orig/arch/cris/Kconfig linux-2.6.34/arch/cris/Kconfig
  config ETRAX_VMEM_SIZE
         int "Video memory size (dec, in MB)"
         depends on ETRAX_ARCH_V32 && !ETRAXFS
-@@ -279,7 +285,7 @@
+@@ -282,7 +288,7 @@
  	select MTD_CFI_AMDSTD
  	select MTD_JEDECPROBE if ETRAX_ARCH_V32
  	select MTD_CHAR
@@ -349,7 +349,7 @@ diff -Nur linux-2.6.34.orig/arch/cris/Kconfig linux-2.6.34/arch/cris/Kconfig
  	select MTD_PARTITIONS
  	select MTD_CONCAT
  	select MTD_COMPLEX_MAPPINGS
-@@ -668,6 +674,11 @@
+@@ -671,6 +677,11 @@
  
  source "drivers/ide/Kconfig"
  
@@ -361,9 +361,9 @@ diff -Nur linux-2.6.34.orig/arch/cris/Kconfig linux-2.6.34/arch/cris/Kconfig
  source "drivers/net/Kconfig"
  
  source "drivers/i2c/Kconfig"
-diff -Nur linux-2.6.34.orig/arch/cris/Makefile linux-2.6.34/arch/cris/Makefile
---- linux-2.6.34.orig/arch/cris/Makefile	2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/arch/cris/Makefile	2010-05-25 19:41:49.751101855 +0200
+diff -Nur linux-2.6.35.7.orig/arch/cris/Makefile linux-2.6.35.7/arch/cris/Makefile
+--- linux-2.6.35.7.orig/arch/cris/Makefile	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/arch/cris/Makefile	2010-10-14 18:50:17.588101050 +0200
 @@ -40,10 +40,10 @@
  
  LD = $(CROSS_COMPILE)ld -mcrislinux
@@ -377,9 +377,9 @@ diff -Nur linux-2.6.34.orig/arch/cris/Makefile linux-2.6.34/arch/cris/Makefile
  KBUILD_CPPFLAGS += $(inc)
  
  ifdef CONFIG_FRAME_POINTER
-diff -Nur linux-2.6.34.orig/drivers/net/cris/eth_v10.c linux-2.6.34/drivers/net/cris/eth_v10.c
---- linux-2.6.34.orig/drivers/net/cris/eth_v10.c	2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/net/cris/eth_v10.c	2010-05-25 19:41:49.809234068 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/net/cris/eth_v10.c linux-2.6.35.7/drivers/net/cris/eth_v10.c
+--- linux-2.6.35.7.orig/drivers/net/cris/eth_v10.c	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/net/cris/eth_v10.c	2010-10-14 18:50:17.634351377 +0200
 @@ -1722,7 +1722,7 @@
  static void
  e100_netpoll(struct net_device* netdev)
@@ -389,9 +389,9 @@ diff -Nur linux-2.6.34.orig/drivers/net/cris/eth_v10.c linux-2.6.34/drivers/net/
  }
  #endif
  
-diff -Nur linux-2.6.34.orig/drivers/serial/crisv10.c linux-2.6.34/drivers/serial/crisv10.c
---- linux-2.6.34.orig/drivers/serial/crisv10.c	2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/serial/crisv10.c	2010-05-25 19:41:51.550975576 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/serial/crisv10.c linux-2.6.35.7/drivers/serial/crisv10.c
+--- linux-2.6.35.7.orig/drivers/serial/crisv10.c	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/serial/crisv10.c	2010-10-14 18:50:17.678091999 +0200
 @@ -13,6 +13,7 @@
  #include <linux/errno.h>
  #include <linux/signal.h>
@@ -441,9 +441,9 @@ diff -Nur linux-2.6.34.orig/drivers/serial/crisv10.c linux-2.6.34/drivers/serial
  	return 0;
  }
  
-diff -Nur linux-2.6.34.orig/drivers/usb/host/hc-cris-dbg.h linux-2.6.34/drivers/usb/host/hc-cris-dbg.h
---- linux-2.6.34.orig/drivers/usb/host/hc-cris-dbg.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/usb/host/hc-cris-dbg.h	2010-05-25 19:41:51.632223123 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/usb/host/hc-cris-dbg.h linux-2.6.35.7/drivers/usb/host/hc-cris-dbg.h
+--- linux-2.6.35.7.orig/drivers/usb/host/hc-cris-dbg.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/usb/host/hc-cris-dbg.h	2010-10-14 18:50:17.714356435 +0200
 @@ -0,0 +1,146 @@
 +
 +/* macros for debug output */
@@ -591,10 +591,10 @@ diff -Nur linux-2.6.34.orig/drivers/usb/host/hc-cris-dbg.h linux-2.6.34/drivers/
 +		};							\
 +		s;							\
 +	})
-diff -Nur linux-2.6.34.orig/drivers/usb/host/hc-crisv10.c linux-2.6.34/drivers/usb/host/hc-crisv10.c
---- linux-2.6.34.orig/drivers/usb/host/hc-crisv10.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/usb/host/hc-crisv10.c	2010-05-25 19:48:39.180967618 +0200
-@@ -0,0 +1,4802 @@
+diff -Nur linux-2.6.35.7.orig/drivers/usb/host/hc-crisv10.c linux-2.6.35.7/drivers/usb/host/hc-crisv10.c
+--- linux-2.6.35.7.orig/drivers/usb/host/hc-crisv10.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/usb/host/hc-crisv10.c	2010-10-14 19:04:20.676850954 +0200
+@@ -0,0 +1,4801 @@
 +/*
 + *
 + * ETRAX 100LX USB Host Controller Driver
@@ -613,14 +613,13 @@ diff -Nur linux-2.6.34.orig/drivers/usb/host/hc-crisv10.c linux-2.6.34/drivers/u
 +#include <linux/spinlock.h>
 +#include <linux/usb.h>
 +#include <linux/platform_device.h>
++#include <linux/usb/hcd.h>
 +
 +#include <asm/io.h>
 +#include <asm/irq.h>
 +#include <arch/dma.h>
 +#include <arch/io_interface_mux.h>
 +
-+#include "../core/hcd.h"
-+#include "../core/hub.h"
 +#include "hc-crisv10.h"
 +#include "hc-cris-dbg.h"
 +
@@ -633,7 +632,7 @@ diff -Nur linux-2.6.34.orig/drivers/usb/host/hc-crisv10.c linux-2.6.34/drivers/u
 +
 +#define VERSION			"1.00 hinko.4"
 +#define COPYRIGHT		"(c) 2005, 2006 Axis Communications AB"
-+#define DESCRIPTION     "ETRAX 100LX USB Host Controller (2.6.25-rc9 port)"
++#define DESCRIPTION     "ETRAX 100LX USB Host Controller"
 +
 +#define ETRAX_USB_HC_IRQ USB_HC_IRQ_NBR
 +#define ETRAX_USB_RX_IRQ USB_DMA_RX_IRQ_NBR
@@ -5397,9 +5396,9 @@ diff -Nur linux-2.6.34.orig/drivers/usb/host/hc-crisv10.c linux-2.6.34/drivers/u
 +/* Module hooks */
 +module_init(module_hcd_init);
 +module_exit(module_hcd_exit);
-diff -Nur linux-2.6.34.orig/drivers/usb/host/hc-crisv10.h linux-2.6.34/drivers/usb/host/hc-crisv10.h
---- linux-2.6.34.orig/drivers/usb/host/hc-crisv10.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.34/drivers/usb/host/hc-crisv10.h	2010-05-25 19:41:51.695693244 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/usb/host/hc-crisv10.h linux-2.6.35.7/drivers/usb/host/hc-crisv10.h
+--- linux-2.6.35.7.orig/drivers/usb/host/hc-crisv10.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.35.7/drivers/usb/host/hc-crisv10.h	2010-10-14 18:50:17.858091974 +0200
 @@ -0,0 +1,331 @@
 +#ifndef __LINUX_ETRAX_USB_H
 +#define __LINUX_ETRAX_USB_H
@@ -5732,9 +5731,9 @@ diff -Nur linux-2.6.34.orig/drivers/usb/host/hc-crisv10.h linux-2.6.34/drivers/u
 +#define USB_SB_command__full__yes       1
 +
 +#endif
-diff -Nur linux-2.6.34.orig/drivers/usb/host/Makefile linux-2.6.34/drivers/usb/host/Makefile
---- linux-2.6.34.orig/drivers/usb/host/Makefile	2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/usb/host/Makefile	2010-05-25 19:42:41.304723153 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/usb/host/Makefile linux-2.6.35.7/drivers/usb/host/Makefile
+--- linux-2.6.35.7.orig/drivers/usb/host/Makefile	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/usb/host/Makefile	2010-10-14 18:50:17.898091962 +0200
 @@ -32,5 +32,6 @@
  obj-$(CONFIG_USB_R8A66597_HCD)	+= r8a66597-hcd.o
  obj-$(CONFIG_USB_ISP1760_HCD)	+= isp1760.o
@@ -5742,9 +5741,9 @@ diff -Nur linux-2.6.34.orig/drivers/usb/host/Makefile linux-2.6.34/drivers/usb/h
 +obj-$(CONFIG_ETRAX_USB_HOST)	+= hc-crisv10.o
  obj-$(CONFIG_USB_IMX21_HCD)	+= imx21-hcd.o
  
-diff -Nur linux-2.6.34.orig/drivers/usb/Makefile linux-2.6.34/drivers/usb/Makefile
---- linux-2.6.34.orig/drivers/usb/Makefile	2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/drivers/usb/Makefile	2010-05-25 19:43:05.884723032 +0200
+diff -Nur linux-2.6.35.7.orig/drivers/usb/Makefile linux-2.6.35.7/drivers/usb/Makefile
+--- linux-2.6.35.7.orig/drivers/usb/Makefile	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/drivers/usb/Makefile	2010-10-14 18:50:17.934371277 +0200
 @@ -21,6 +21,7 @@
  obj-$(CONFIG_USB_R8A66597_HCD)	+= host/
  obj-$(CONFIG_USB_HWA_HCD)	+= host/
@@ -5753,9 +5752,9 @@ diff -Nur linux-2.6.34.orig/drivers/usb/Makefile linux-2.6.34/drivers/usb/Makefi
  obj-$(CONFIG_USB_IMX21_HCD)	+= host/
  
  obj-$(CONFIG_USB_C67X00_HCD)	+= c67x00/
-diff -Nur linux-2.6.34.orig/lib/klist.c linux-2.6.34/lib/klist.c
---- linux-2.6.34.orig/lib/klist.c	2010-05-16 23:17:36.000000000 +0200
-+++ linux-2.6.34/lib/klist.c	2010-05-25 19:41:55.440969800 +0200
+diff -Nur linux-2.6.35.7.orig/lib/klist.c linux-2.6.35.7/lib/klist.c
+--- linux-2.6.35.7.orig/lib/klist.c	2010-09-29 03:09:08.000000000 +0200
++++ linux-2.6.35.7/lib/klist.c	2010-10-14 18:50:17.978091963 +0200
 @@ -60,7 +60,7 @@
  {
  	knode->n_klist = klist;
diff --git a/target/foxboard/target.mk b/target/foxboard/target.mk
index d4eb2ab29..23474ad20 100644
--- a/target/foxboard/target.mk
+++ b/target/foxboard/target.mk
@@ -1,7 +1,7 @@
 ARCH:=			cris
 CPU_ARCH:=		cris
-KERNEL_VERSION:=	2.6.34
+KERNEL_VERSION:=	2.6.35.7
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		10eebcb0178fb4540e2165bfd7efc7ad
+KERNEL_MD5SUM:=		f741879bcd3a5366a1bbe0ad5cdb7935
 TARGET_OPTIMIZATION:=	-Os -pipe -fno-peephole2
 TARGET_CFLAGS_ARCH:=    -march=v10