summaryrefslogtreecommitdiff
path: root/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-09-19 23:50:02 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-09-19 23:50:02 +0000
commitd898c2926f10db4e9356b61fd2402aa051cf1d2f (patch)
treeefee39f9596c884a2f806369e0a4f7b6007f4991 /target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
parent21cd9bc80a0e40762c6d45bed1dbb2105b81f104 (diff)
cns3xxx: reorganize patches, fix pcie io space init order
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33486 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch')
-rw-r--r--target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch13
1 files changed, 1 insertions, 12 deletions
diff --git a/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch b/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
index 135247b54f..a4d186c868 100644
--- a/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
+++ b/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch
@@ -96,7 +96,7 @@
/* used by entry-macro.S */
--- a/arch/arm/mach-cns3xxx/core.h
+++ b/arch/arm/mach-cns3xxx/core.h
-@@ -20,7 +20,7 @@ void __init cns3xxx_l2x0_init(void);
+@@ -21,7 +21,7 @@ void __init cns3xxx_l2x0_init(void);
static inline void cns3xxx_l2x0_init(void) {}
#endif /* CONFIG_CACHE_L2X0 */
@@ -105,14 +105,3 @@
void __init cns3xxx_init_irq(void);
void cns3xxx_power_off(void);
void cns3xxx_restart(char, const char *);
---- a/arch/arm/mach-cns3xxx/laguna.c
-+++ b/arch/arm/mach-cns3xxx/laguna.c
-@@ -612,7 +612,7 @@ static struct map_desc laguna_io_desc[]
-
- static void __init laguna_map_io(void)
- {
-- cns3xxx_map_io();
-+ cns3xxx_common_init();
- iotable_init(laguna_io_desc, ARRAY_SIZE(laguna_io_desc));
- laguna_early_serial_setup();
- }