BCMA - Reorder SPROM fill

[openwrt.git] / target / linux / lantiq / patches-2.6.32 / 160-falcon-95C3AM1.patch

diff --git a/target/linux/lantiq/patches-2.6.32/160-falcon-95C3AM1.patch b/target/linux/lantiq/patches-2.6.32/160-falcon-95C3AM1.patch
index 0347037..37e57c2 100644 (file)
--- a/target/linux/lantiq/patches-2.6.32/160-falcon-95C3AM1.patch
+++ b/target/linux/lantiq/patches-2.6.32/160-falcon-95C3AM1.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/arch/mips/lantiq/falcon/mach-95C3AM1.c
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,101 @@
 +#include <linux/init.h>
 +#include <linux/platform_device.h>
 +#include <linux/i2c-gpio.h>
@@ -14,8 +14,6 @@
 +#define BOARD_95C3AM1_GPIO_LED_2 12
 +#define BOARD_95C3AM1_GPIO_LED_3 13
 +
-+extern unsigned char ltq_ethaddr[6];
-+
 +#ifdef CONFIG_MTD_PARTITIONS
 +static struct mtd_partition board_95C3AM1_partitions[] =
 +{
@@ -106,7 +104,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
  
@@ -119,16 +117,16 @@
  endif
 --- a/arch/mips/lantiq/falcon/Makefile
 +++ b/arch/mips/lantiq/falcon/Makefile
-@@ -3,3 +3,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
-@@ -20,6 +20,7 @@
-       LANTIQ_MACH_EASY98000,          /* Falcon Eval Board, NOR Flash */
+@@ -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 */
 +      LANTIQ_MACH_95C3AM1,            /* Board 95C3AM1 */
  };