diff options
| author | John Crispin <blogic@openwrt.org> | 2011-09-26 09:35:02 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2011-09-26 09:35:02 +0000 |
| commit | 1489979632b8a49a060bd14bb4a803788db6e07c (patch) | |
| tree | 77835fdd2c75e4d6e577b2d74c0f065123dcb1d0 /target/linux/lantiq/patches-3.0/160-falcon-95C3AM1.patch | |
| parent | 573a49afbe1007930b46e49eeb1b01659ef7c83e (diff) | |
| download | upstream-1489979632b8a49a060bd14bb4a803788db6e07c.tar.gz upstream-1489979632b8a49a060bd14bb4a803788db6e07c.tar.bz2 upstream-1489979632b8a49a060bd14bb4a803788db6e07c.zip | |
[lantiq]
* rebase 3.0 patches
* fold some fixes into existing patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28308 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.0/160-falcon-95C3AM1.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.0/160-falcon-95C3AM1.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/lantiq/patches-3.0/160-falcon-95C3AM1.patch b/target/linux/lantiq/patches-3.0/160-falcon-95C3AM1.patch index f18d42c07f..7245eb5b62 100644 --- a/target/linux/lantiq/patches-3.0/160-falcon-95C3AM1.patch +++ b/target/linux/lantiq/patches-3.0/160-falcon-95C3AM1.patch @@ -102,7 +102,7 @@ + board_95C3AM1_init); --- a/arch/mips/lantiq/falcon/Kconfig +++ b/arch/mips/lantiq/falcon/Kconfig -@@ -10,6 +10,10 @@ +@@ -10,6 +10,10 @@ config LANTIQ_MACH_EASY98020 bool "Easy98020" default y @@ -115,14 +115,14 @@ endif --- a/arch/mips/lantiq/falcon/Makefile +++ b/arch/mips/lantiq/falcon/Makefile -@@ -4,3 +4,4 @@ +@@ -4,3 +4,4 @@ obj-$(CONFIG_LANTIQ_MACH_EASY98000) += a obj-$(CONFIG_LANTIQ_MACH_EASY98000) += mach-easy98000.o obj-$(CONFIG_LANTIQ_MACH_EASY98000) += dev-leds-easy98000-cpld.o obj-$(CONFIG_LANTIQ_MACH_EASY98020) += mach-easy98020.o +obj-$(CONFIG_LANTIQ_MACH_95C3AM1) += mach-95C3AM1.o --- a/arch/mips/lantiq/machtypes.h +++ b/arch/mips/lantiq/machtypes.h -@@ -21,6 +21,7 @@ +@@ -21,6 +21,7 @@ enum lantiq_mach_type { LANTIQ_MACH_EASY98000SF, /* Falcon Eval Board, Serial Flash */ LANTIQ_MACH_EASY98000NAND, /* Falcon Eval Board, NAND Flash */ LANTIQ_MACH_EASY98020, /* Falcon Reference Board */ |