From: Imre Kaloz Date: Thu, 7 Jul 2011 17:18:50 +0000 (+0000) Subject: refresh patches X-Git-Tag: reboot~16298 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=79fa6c693a8c2bb321ca308b19b8f43ee8d3408d;p=oweals%2Fopenwrt.git refresh patches SVN-Revision: 27528 --- diff --git a/target/linux/cns3xxx/patches-3.0/001-cns3xxx_v6k_cpu.patch b/target/linux/cns3xxx/patches-3.0/001-cns3xxx_v6k_cpu.patch index 6ba8a27e53..26e1f5eedc 100644 --- a/target/linux/cns3xxx/patches-3.0/001-cns3xxx_v6k_cpu.patch +++ b/target/linux/cns3xxx/patches-3.0/001-cns3xxx_v6k_cpu.patch @@ -10,11 +10,9 @@ Signed-off-by: Imre Kaloz arch/arm/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 9adc278..c2e5f3d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -321,7 +321,7 @@ config ARCH_CLPS711X +@@ -322,7 +322,7 @@ config ARCH_CLPS711X config ARCH_CNS3XXX bool "Cavium Networks CNS3XXX family" @@ -23,6 +21,3 @@ index 9adc278..c2e5f3d 100644 select GENERIC_CLOCKEVENTS select ARM_GIC select MIGHT_HAVE_PCI --- -1.7.1 - diff --git a/target/linux/cns3xxx/patches-3.0/100-laguna_support.patch b/target/linux/cns3xxx/patches-3.0/100-laguna_support.patch index c5431272d6..b0399db4bd 100644 --- a/target/linux/cns3xxx/patches-3.0/100-laguna_support.patch +++ b/target/linux/cns3xxx/patches-3.0/100-laguna_support.patch @@ -815,10 +815,10 @@ --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -322,6 +322,7 @@ config ARCH_CLPS711X +@@ -323,6 +323,7 @@ config ARCH_CLPS711X config ARCH_CNS3XXX bool "Cavium Networks CNS3XXX family" - select CPU_V6 + select CPU_V6K + select ARCH_WANT_OPTIONAL_GPIOLIB select GENERIC_CLOCKEVENTS select ARM_GIC