aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-01-31 09:43:57 +0000
committerJonas Gorski <jogo@openwrt.org>2012-01-31 09:43:57 +0000
commit1015fab0d7d64107be4dd6c798b88bff357575cb (patch)
tree4acaf873b8e8ce21ed6f583fd210b2bf86350138 /target/linux/cns3xxx
parente67f4477bb4a423a0d45418a5c0d228d425ecbce (diff)
downloadupstream-1015fab0d7d64107be4dd6c798b88bff357575cb.tar.gz
upstream-1015fab0d7d64107be4dd6c798b88bff357575cb.tar.bz2
upstream-1015fab0d7d64107be4dd6c798b88bff357575cb.zip
kernel: update linux 3.1 to 3.1.10
SVN-Revision: 29966
Diffstat (limited to 'target/linux/cns3xxx')
-rw-r--r--target/linux/cns3xxx/patches-3.1/049-cns3xxx_smp_support.patch2
-rw-r--r--target/linux/cns3xxx/patches-3.1/200-dwc_otg.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/cns3xxx/patches-3.1/049-cns3xxx_smp_support.patch b/target/linux/cns3xxx/patches-3.1/049-cns3xxx_smp_support.patch
index 854c7fa7a6..e34134055e 100644
--- a/target/linux/cns3xxx/patches-3.1/049-cns3xxx_smp_support.patch
+++ b/target/linux/cns3xxx/patches-3.1/049-cns3xxx_smp_support.patch
@@ -404,7 +404,7 @@
+}
--- 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 || \
diff --git a/target/linux/cns3xxx/patches-3.1/200-dwc_otg.patch b/target/linux/cns3xxx/patches-3.1/200-dwc_otg.patch
index c53189f2e7..27a97126d0 100644
--- a/target/linux/cns3xxx/patches-3.1/200-dwc_otg.patch
+++ b/target/linux/cns3xxx/patches-3.1/200-dwc_otg.patch
@@ -22654,8 +22654,8 @@
+ 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