summaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx/patches-3.1/100-laguna_support.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2011-11-07 21:13:13 +0000
committerImre Kaloz <kaloz@openwrt.org>2011-11-07 21:13:13 +0000
commitcc2cf8f3d540c26aa672bfcfe0ebdb11ba8cdb6f (patch)
tree9fb0641fac9f637daa5d21fe001dbb4afaff8804 /target/linux/cns3xxx/patches-3.1/100-laguna_support.patch
parentc4bc2552a30f8242a119dd213087d2bdeeef639d (diff)
downloadmaster-31e0f0ae-cc2cf8f3d540c26aa672bfcfe0ebdb11ba8cdb6f.tar.gz
master-31e0f0ae-cc2cf8f3d540c26aa672bfcfe0ebdb11ba8cdb6f.tar.bz2
master-31e0f0ae-cc2cf8f3d540c26aa672bfcfe0ebdb11ba8cdb6f.zip
update 3.1 patches
SVN-Revision: 28814
Diffstat (limited to 'target/linux/cns3xxx/patches-3.1/100-laguna_support.patch')
-rw-r--r--target/linux/cns3xxx/patches-3.1/100-laguna_support.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/cns3xxx/patches-3.1/100-laguna_support.patch b/target/linux/cns3xxx/patches-3.1/100-laguna_support.patch
index 7e6628bad5..12fe8005e9 100644
--- a/target/linux/cns3xxx/patches-3.1/100-laguna_support.patch
+++ b/target/linux/cns3xxx/patches-3.1/100-laguna_support.patch
@@ -980,13 +980,13 @@
pm_power_off = cns3xxx_power_off;
}
---- a/arch/arm/mach-cns3xxx/include/mach/platform.h
-+++ b/arch/arm/mach-cns3xxx/include/mach/platform.h
-@@ -22,5 +22,7 @@ struct cns3xxx_plat_info {
- u32 phy[3];
- };
+--- a/arch/arm/mach-cns3xxx/core.h
++++ b/arch/arm/mach-cns3xxx/core.h
+@@ -12,6 +12,7 @@
+ #define __CNS3XXX_CORE_H
+ extern struct sys_timer cns3xxx_timer;
+extern int cns3xxx_pcie_init(u8 bitmap);
-+
- #endif /* __ASM_ARCH_PLATFORM_H */
- #endif
+
+ #ifdef CONFIG_CACHE_L2X0
+ void __init cns3xxx_l2x0_init(void);