kernel: update linux 3.1 to 3.1.10
authorJonas Gorski <jogo@openwrt.org>
Tue, 31 Jan 2012 09:43:57 +0000 (09:43 +0000)
committerJonas Gorski <jogo@openwrt.org>
Tue, 31 Jan 2012 09:43:57 +0000 (09:43 +0000)
SVN-Revision: 29966

include/kernel-version.mk
target/linux/cns3xxx/patches-3.1/049-cns3xxx_smp_support.patch
target/linux/cns3xxx/patches-3.1/200-dwc_otg.patch
target/linux/lantiq/Makefile
target/linux/omap24xx/Makefile

index 85bfe81af25405a8675bbf66affaec33a6b3732e..fc2203f5d00a4772fee7740a8f78b55db79d6ecb 100644 (file)
@@ -32,8 +32,8 @@ endif
 ifeq ($(LINUX_VERSION),3.0.18)
   LINUX_KERNEL_MD5SUM:=67252770d7009eabe8bac7c26e074f9d
 endif
-ifeq ($(LINUX_VERSION),3.1.9)
-  LINUX_KERNEL_MD5SUM:=4e387a49cde20805955c905bc8c311e0
+ifeq ($(LINUX_VERSION),3.1.10)
+  LINUX_KERNEL_MD5SUM:=3649bdaa50ffd9114cc16486ec54d83a
 endif
 ifeq ($(LINUX_VERSION),3.2.1)
   LINUX_KERNEL_MD5SUM:=090eb3dae0f520f7770f85193e931ad3
index 854c7fa7a6ce19566caa4735a905c9dbb8c89771..e34134055edc58767922d87695865a04812c71db 100644 (file)
 +}
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1376,7 +1376,7 @@ config SMP
+@@ -1388,7 +1388,7 @@ config SMP
        depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
                 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
                 ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
index c53189f2e7c08c70c74202c6f1190fd3975ca07d..27a97126d0e0ecca685f853c12cd812cd6645cf7 100644 (file)
 +      dma_addr_t aligned_transfer_dma;/* (in) dma addr for transfer_buffer */
 +      u32 aligned_transfer_buffer_length; /* (in) data buffer length */
        struct scatterlist *sg;         /* (in) scatter gather buffer list */
+       int num_mapped_sgs;             /* (internal) mapped sg entries */
        int num_sgs;                    /* (in) number of entries in the sg list */
-       u32 transfer_buffer_length;     /* (in) data buffer length */
 --- a/drivers/usb/gadget/Kconfig
 +++ b/drivers/usb/gadget/Kconfig
 @@ -108,7 +108,7 @@ config USB_GADGET_VBUS_DRAW
index dced25ffdd31af2590cd65c5540359abae886786..b0bed09dfd099d750ae704e7362ce911378842a0 100644 (file)
@@ -12,7 +12,7 @@ BOARDNAME:=Lantiq GPON/XWAY
 FEATURES:=squashfs jffs2
 DEFAULT_SUBTARGET:=danube
 
-LINUX_VERSION:=3.1.9
+LINUX_VERSION:=3.1.10
 
 CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves
 
index 087c7077541639640cee0c19b8b207acb538a669..1188a9c087201ae02543ace8e55d8f7dae005380 100644 (file)
@@ -12,7 +12,7 @@ BOARDNAME:=TI OMAP-24xx
 MAINTAINER:=Michael Buesch <m@bues.ch>
 FEATURES:=targz squashfs jffs2 usb usbgadget display gpio audio
 
-LINUX_VERSION:=3.1.9
+LINUX_VERSION:=3.1.10
 
 define Target/Description
        TI OMAP-24xx