make grub compilable under fedora core 8 and other newer distros

[openwrt.git] / target / linux / ixp4xx / patches-2.6.25 / 180-tw5334_support.patch

diff --git a/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch b/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch
index c02866b..c403a87 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/180-tw5334_support.patch
@@ -1,6 +1,5 @@
-diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Kconfig
---- linux-2.6.24.2/arch/arm/mach-ixp4xx/Kconfig        2008-04-09 01:34:46.000000000 +0200
-+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Kconfig   2008-04-09 00:06:48.000000000 +0200
+--- a/arch/arm/mach-ixp4xx/Kconfig
++++ b/arch/arm/mach-ixp4xx/Kconfig

 @@ -150,6 +150,14 @@
          PrPCM1100 Processor Mezanine Module. For more information on
          this platform, see <file:Documentation/arm/IXP4xx>.
 @@ -150,6 +150,14 @@
          PrPCM1100 Processor Mezanine Module. For more information on
          this platform, see <file:Documentation/arm/IXP4xx>.


@@ -16,9 +15,8 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.24.2-owrt/arch/a
  config MACH_NAS100D
        bool
        prompt "NAS100D"
  config MACH_NAS100D
        bool
        prompt "NAS100D"

-diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Makefile
---- linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile       2008-04-09 01:34:46.000000000 +0200
-+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/Makefile  2008-04-09 00:07:45.000000000 +0200
+--- a/arch/arm/mach-ixp4xx/Makefile
++++ b/arch/arm/mach-ixp4xx/Makefile

 @@ -22,6 +22,7 @@
  obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
  obj-pci-$(CONFIG_MACH_SIDEWINDER)             += sidewinder-pci.o
 @@ -22,6 +22,7 @@
  obj-pci-$(CONFIG_MACH_WRT300NV2)              += wrt300nv2-pci.o
  obj-pci-$(CONFIG_MACH_SIDEWINDER)             += sidewinder-pci.o


@@ -35,9 +33,8 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/Makefile linux-2.6.24.2-owrt/arch/
  
  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.24.2/arch/arm/mach-ixp4xx/tw5334-setup.c linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-setup.c
---- linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-setup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-setup.c    2008-04-09 01:58:52.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-ixp4xx/tw5334-setup.c

 @@ -0,0 +1,162 @@
 +/*
 + * arch/arm/mach-ixp4xx/tw5334-setup.c
 @@ -0,0 +1,162 @@
 +/*
 + * arch/arm/mach-ixp4xx/tw5334-setup.c


@@ -201,9 +198,8 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-setup.c linux-2.6.24.2-owrt
 +      .init_machine   = tw5334_init,
 +MACHINE_END
 +#endif
 +      .init_machine   = tw5334_init,
 +MACHINE_END
 +#endif

-diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-pci.c linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-pci.c
---- linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-pci.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.24.2-owrt/arch/arm/mach-ixp4xx/tw5334-pci.c      2008-04-09 00:35:32.000000000 +0200
+--- /dev/null
++++ b/arch/arm/mach-ixp4xx/tw5334-pci.c

 @@ -0,0 +1,69 @@
 +/*
 + * arch/arch/mach-ixp4xx/tw5334-pci.c
 @@ -0,0 +1,69 @@
 +/*
 + * arch/arch/mach-ixp4xx/tw5334-pci.c


@@ -274,8 +270,8 @@ diff -Nur linux-2.6.24.2/arch/arm/mach-ixp4xx/tw5334-pci.c linux-2.6.24.2-owrt/a
 +}
 +
 +subsys_initcall(tw5334_pci_init);
 +}
 +
 +subsys_initcall(tw5334_pci_init);

---- linux-2.6.24.2/include/asm-arm/arch-ixp4xx/uncompress.h    2008-04-07 08:59:19.000000000 +0200
-+++ linux-2.6.24.2-owrt/include/asm-arm/arch-ixp4xx/uncompress.h       2008-04-09 13:22:42.000000000 +0200
+--- a/include/asm-arm/arch-ixp4xx/uncompress.h
++++ b/include/asm-arm/arch-ixp4xx/uncompress.h

 @@ -42,7 +42,8 @@
         */
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||
 @@ -42,7 +42,8 @@
         */
        if (machine_is_adi_coyote() || machine_is_gtwx5715() ||