summaryrefslogtreecommitdiff
path: root/target/linux/cns3xxx
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-07 17:18:50 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-07 17:18:50 +0000
commit145f06f8eb66458599c6ca3708a5b5e87c41e8ae (patch)
treec4293a7f19965e1b1051ca84ff48903d7b8422de /target/linux/cns3xxx
parent72a7b909770c75c433f4833c9f506bb1ab4906bb (diff)
[cns3xxx]: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27528 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/cns3xxx')
-rw-r--r--target/linux/cns3xxx/patches-3.0/001-cns3xxx_v6k_cpu.patch7
-rw-r--r--target/linux/cns3xxx/patches-3.0/100-laguna_support.patch4
2 files changed, 3 insertions, 8 deletions
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 <kaloz@openwrt.org>
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