diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2012-11-09 21:37:54 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2012-11-09 21:37:54 +0000 |
| commit | f3f3f52259c1db74069295ad296ac1d53b080b45 (patch) | |
| tree | 74aec692086c606fa5b276a13e2cef64b86eeb04 /target/linux/cns3xxx/patches-3.3/104-cns3xxx_gpio.patch | |
| parent | 71ddec8091c215661ef3934fc93eb497b6cc2985 (diff) | |
| download | upstream-f3f3f52259c1db74069295ad296ac1d53b080b45.tar.gz upstream-f3f3f52259c1db74069295ad296ac1d53b080b45.tar.bz2 upstream-f3f3f52259c1db74069295ad296ac1d53b080b45.zip | |
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 <tharvey@gateworks.com>
SVN-Revision: 34132
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.patch | 4 |
1 files changed, 2 insertions, 2 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 bda0222cca..1f0d44401b 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 */ |