[kernel] 2.6.26: fix gpio_dev compile error

[openwrt.git] / target / linux / ixp4xx / patches-2.6.25 / 140-sidewinder_support.patch

diff --git a/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch b/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch
index 48d567f..50f6e27 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/140-sidewinder_support.patch
@@ -1,6 +1,5 @@
-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Kconfig
---- linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig  2007-10-23 19:20:08.000000000 +0200
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Kconfig     2007-10-23 19:26:46.000000000 +0200
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig

 @@ -65,6 +65,14 @@
          Engineering Pronghorn Metro Platform. For more
          information on this platform, see <file:Documentation/arm/IXP4xx>.
 @@ -65,6 +65,14 @@
          Engineering Pronghorn Metro Platform. For more
          information on this platform, see <file:Documentation/arm/IXP4xx>.


@@ -25,9 +24,8 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Kconfig linux-2.6.23-owrt/arch/arm/m
        default y
  
  config CPU_IXP43X
        default y
  
  config CPU_IXP43X

-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile
---- linux-2.6.23/arch/arm/mach-ixp4xx/Makefile 2007-10-23 19:20:08.000000000 +0200
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/Makefile    2007-10-23 19:23:52.000000000 +0200
+--- a/arch/arm/mach-ixp4xx/Makefile
++++ b/arch/arm/mach-ixp4xx/Makefile

 @@ -19,6 +19,7 @@
  obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o
 @@ -19,6 +19,7 @@
  obj-pci-$(CONFIG_MACH_PRONGHORNMETRO) += pronghornmetro-pci.o
  obj-pci-$(CONFIG_MACH_COMPEX)         += ixdp425-pci.o


@@ -44,9 +42,8 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/Makefile linux-2.6.23-owrt/arch/arm/
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
  
  obj-$(CONFIG_PCI)             += $(obj-pci-$(CONFIG_PCI)) common-pci.o
  obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o

-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-pci.c
---- linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-pci.c    2007-10-23 19:23:52.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-ixp4xx/sidewinder-pci.c

 @@ -0,0 +1,71 @@
 +/*
 + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c
 @@ -0,0 +1,71 @@
 +/*
 + * arch/arch/mach-ixp4xx/pronghornmetro-pci.c


@@ -119,9 +116,8 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-pci.c linux-2.6.23-owrt/a
 +}
 +
 +subsys_initcall(sidewinder_pci_init);
 +}
 +
 +subsys_initcall(sidewinder_pci_init);

-diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-setup.c linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-setup.c
---- linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-setup.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23-owrt/arch/arm/mach-ixp4xx/sidewinder-setup.c  2007-10-23 19:23:52.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-ixp4xx/sidewinder-setup.c

 @@ -0,0 +1,115 @@
 +/*
 + * arch/arm/mach-ixp4xx/sidewinder-setup.c
 @@ -0,0 +1,115 @@
 +/*
 + * arch/arm/mach-ixp4xx/sidewinder-setup.c


@@ -204,8 +200,8 @@ diff -Nur linux-2.6.23/arch/arm/mach-ixp4xx/sidewinder-setup.c linux-2.6.23-owrt
 +      .dev                    = {
 +              .platform_data  = sidewinder_uart_data,
 +      },
 +      .dev                    = {
 +              .platform_data  = sidewinder_uart_data,
 +      },

-+      .num_resources  = 2,
-+      .resource       = &sidewinder_uart_resources,
++      .num_resources  = ARRAY_SIZE(sidewinder_uart_resources),
++      .resource       = sidewinder_uart_resources,

 +};
 +
 +static struct platform_device *sidewinder_devices[] __initdata = {
 +};
 +
 +static struct platform_device *sidewinder_devices[] __initdata = {