refresh patches

SVN-Revision: 27528
This commit is contained in:
Imre Kaloz 2011-07-07 17:18:50 +00:00
parent b8227050fb
commit 79fa6c693a
2 changed files with 3 additions and 8 deletions

View File

@ -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

View File

@ -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