[brcm47xx] Port to kernel 2.6.30.

[openwrt.git] / target / linux / ixp4xx / patches-2.6.26 / 030-ixp4xx_fsg_board_support.patch

diff --git a/target/linux/ixp4xx/patches-2.6.26/030-ixp4xx_fsg_board_support.patch b/target/linux/ixp4xx/patches-2.6.26/030-ixp4xx_fsg_board_support.patch
index 048b9f7..1707cff 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/030-ixp4xx_fsg_board_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/030-ixp4xx_fsg_board_support.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/configs/ixp4xx_defconfig
 +++ b/arch/arm/configs/ixp4xx_defconfig
 --- a/arch/arm/configs/ixp4xx_defconfig
 +++ b/arch/arm/configs/ixp4xx_defconfig

-@@ -165,6 +165,7 @@
+@@ -165,6 +165,7 @@ CONFIG_ARCH_PRPMC1100=y

  CONFIG_MACH_NAS100D=y
  CONFIG_MACH_DSMG600=y
  CONFIG_ARCH_IXDP4XX=y
  CONFIG_MACH_NAS100D=y
  CONFIG_MACH_DSMG600=y
  CONFIG_ARCH_IXDP4XX=y


@@ -8,7 +8,7 @@
  CONFIG_CPU_IXP46X=y
  CONFIG_CPU_IXP43X=y
  CONFIG_MACH_GTWX5715=y
  CONFIG_CPU_IXP46X=y
  CONFIG_CPU_IXP43X=y
  CONFIG_MACH_GTWX5715=y

-@@ -770,7 +771,7 @@
+@@ -770,7 +771,7 @@ CONFIG_ATA=y

  # CONFIG_SATA_SIL24 is not set
  # CONFIG_SATA_SIS is not set
  # CONFIG_SATA_ULI is not set
  # CONFIG_SATA_SIL24 is not set
  # CONFIG_SATA_SIS is not set
  # CONFIG_SATA_ULI is not set


@@ -17,7 +17,7 @@
  # CONFIG_SATA_VITESSE is not set
  # CONFIG_SATA_INIC162X is not set
  # CONFIG_PATA_ALI is not set
  # CONFIG_SATA_VITESSE is not set
  # CONFIG_SATA_INIC162X is not set
  # CONFIG_PATA_ALI is not set

-@@ -1143,7 +1144,7 @@
+@@ -1143,7 +1144,7 @@ CONFIG_HWMON=y

  # CONFIG_SENSORS_VIA686A is not set
  # CONFIG_SENSORS_VT1211 is not set
  # CONFIG_SENSORS_VT8231 is not set
  # CONFIG_SENSORS_VIA686A is not set
  # CONFIG_SENSORS_VT1211 is not set
  # CONFIG_SENSORS_VT8231 is not set


@@ -26,7 +26,7 @@
  # CONFIG_SENSORS_W83791D is not set
  # CONFIG_SENSORS_W83792D is not set
  # CONFIG_SENSORS_W83793 is not set
  # CONFIG_SENSORS_W83791D is not set
  # CONFIG_SENSORS_W83792D is not set
  # CONFIG_SENSORS_W83793 is not set

-@@ -1334,8 +1335,8 @@
+@@ -1334,8 +1335,8 @@ CONFIG_LEDS_CLASS=y

  #
  # LED drivers
  #
  #
  # LED drivers
  #


@@ -36,7 +36,7 @@
  
  #
  # LED Triggers
  
  #
  # LED Triggers

-@@ -1367,7 +1368,7 @@
+@@ -1367,7 +1368,7 @@ CONFIG_RTC_INTF_DEV=y

  # CONFIG_RTC_DRV_DS1672 is not set
  # CONFIG_RTC_DRV_MAX6900 is not set
  # CONFIG_RTC_DRV_RS5C372 is not set
  # CONFIG_RTC_DRV_DS1672 is not set
  # CONFIG_RTC_DRV_MAX6900 is not set
  # CONFIG_RTC_DRV_RS5C372 is not set


@@ -47,7 +47,7 @@
  # CONFIG_RTC_DRV_PCF8583 is not set
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig
  # CONFIG_RTC_DRV_PCF8583 is not set
 --- a/arch/arm/mach-ixp4xx/Kconfig
 +++ b/arch/arm/mach-ixp4xx/Kconfig

-@@ -125,6 +125,15 @@
+@@ -125,6 +125,15 @@ config    ARCH_IXDP4XX

        depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
        default y
  
        depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435
        default y
  


@@ -65,7 +65,7 @@
  #
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile
  #
 --- a/arch/arm/mach-ixp4xx/Makefile
 +++ b/arch/arm/mach-ixp4xx/Makefile

-@@ -15,6 +15,7 @@
+@@ -15,6 +15,7 @@ obj-pci-$(CONFIG_MACH_NAS100D)               += nas10

  obj-pci-$(CONFIG_MACH_DSMG600)                += dsmg600-pci.o
  obj-pci-$(CONFIG_MACH_GATEWAY7001)    += gateway7001-pci.o
  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o
  obj-pci-$(CONFIG_MACH_DSMG600)                += dsmg600-pci.o
  obj-pci-$(CONFIG_MACH_GATEWAY7001)    += gateway7001-pci.o
  obj-pci-$(CONFIG_MACH_WG302V2)                += wg302v2-pci.o


@@ -73,7 +73,7 @@
  
  obj-y += common.o
  
  
  obj-y += common.o
  

-@@ -28,6 +29,7 @@
+@@ -28,6 +29,7 @@ obj-$(CONFIG_MACH_NAS100D)   += nas100d-se

  obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
  obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o
  obj-$(CONFIG_MACH_DSMG600)      += dsmg600-setup.o
  obj-$(CONFIG_MACH_GATEWAY7001)        += gateway7001-setup.o
  obj-$(CONFIG_MACH_WG302V2)    += wg302v2-setup.o


@@ -224,7 +224,7 @@
 +
 +static struct i2c_board_info __initdata fsg_i2c_board_info [] = {
 +      {
 +
 +static struct i2c_board_info __initdata fsg_i2c_board_info [] = {
 +      {

-+              I2C_BOARD_INFO("rtc-isl1208", 0x6f),
++              I2C_BOARD_INFO("isl1208", 0x6f),

 +      },
 +};
 +
 +      },
 +};
 +