From 42fc31c3969f22ab2eb9ccea31338a6fd11e836e Mon Sep 17 00:00:00 2001 From: kaloz Date: Fri, 9 Nov 2012 21:37:54 +0000 Subject: cns3xxx: clean up pcie patches Combine two pcie patches (2nd patch undid the 1st patch) together and refresh the other affected patches Signed-off-by: Tim Harvey git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34132 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch') 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 bda0222cc..1f0d44401 100644 --- a/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch +++ b/target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-cns3xxx/cns3420vb.c +++ b/arch/arm/mach-cns3xxx/cns3420vb.c -@@ -216,7 +216,7 @@ static struct map_desc cns3420_io_desc[] +@@ -213,7 +213,7 @@ static struct map_desc cns3420_io_desc[] static void __init cns3420_map_io(void) { @@ -96,7 +96,7 @@ /* used by entry-macro.S */ --- a/arch/arm/mach-cns3xxx/core.h +++ b/arch/arm/mach-cns3xxx/core.h -@@ -21,7 +21,7 @@ void __init cns3xxx_l2x0_init(void); +@@ -19,7 +19,7 @@ void __init cns3xxx_l2x0_init(void); static inline void cns3xxx_l2x0_init(void) {} #endif /* CONFIG_CACHE_L2X0 */ -- cgit v1.2.3