suppress warnings.

[openwrt.git] / target / linux / aruba-2.6 / patches / 000-aruba.patch

diff --git a/target/linux/aruba-2.6/patches/000-aruba.patch b/target/linux/aruba-2.6/patches/000-aruba.patch
index 7bb8a26..4263f8e 100644 (file)
--- a/target/linux/aruba-2.6/patches/000-aruba.patch
+++ b/target/linux/aruba-2.6/patches/000-aruba.patch
@@ -783,7 +783,7 @@ diff -Nur linux-2.6.16/arch/mips/aruba/serial.c linux-2.6.16-owrt/arch/mips/arub
 diff -Nur linux-2.6.16/arch/mips/aruba/setup.c linux-2.6.16-owrt/arch/mips/aruba/setup.c
 --- linux-2.6.16/arch/mips/aruba/setup.c       1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.16-owrt/arch/mips/aruba/setup.c  2006-03-20 14:30:00.000000000 +0100
-@@ -0,0 +1,125 @@
+@@ -0,0 +1,134 @@
 +/**************************************************************************
 + *
 + *  BRIEF MODULE DESCRIPTION
@@ -905,7 +905,16 @@ diff -Nur linux-2.6.16/arch/mips/aruba/setup.c linux-2.6.16-owrt/arch/mips/aruba
 +
 +const char *get_system_type(void)
 +{
-+      return "MIPS IDT32434 - ARUBA";
++      switch (mips_machtype) {
++              case MACH_ARUBA_AP70:
++                      return "Aruba AP70";
++              case MACH_ARUBA_AP65:
++                      return "Aruba AP65";
++              case MACH_ARUBA_AP60:
++                      return "Aruba AP60/AP61";
++              default:
++                      return "Aruba UNKNOWN";
++      }
 +}
 +
 +EXPORT_SYMBOL(get_system_type);
@@ -10492,18 +10501,6 @@ diff -Nur linux-2.6.16/include/asm-mips/mach-generic/irq.h linux-2.6.16-owrt/inc
 +#define NR_IRQS       256
  
  #endif /* __ASM_MACH_GENERIC_IRQ_H */
-diff -Nur linux-2.6.16/include/linux/init.h linux-2.6.16-owrt/include/linux/init.h
---- linux-2.6.16/include/linux/init.h  2006-03-20 06:53:29.000000000 +0100
-+++ linux-2.6.16-owrt/include/linux/init.h     2006-03-20 14:25:10.000000000 +0100
-@@ -86,6 +86,8 @@
-       static initcall_t __initcall_##fn __attribute_used__ \
-       __attribute__((__section__(".initcall" level ".init"))) = fn
- 
-+#define early_initcall(fn)              __define_initcall(".early1",fn)
-+
- #define core_initcall(fn)             __define_initcall("1",fn)
- #define postcore_initcall(fn)         __define_initcall("2",fn)
- #define arch_initcall(fn)             __define_initcall("3",fn)
 diff -Nur linux-2.6.16/include/linux/kernel.h linux-2.6.16-owrt/include/linux/kernel.h
 --- linux-2.6.16/include/linux/kernel.h        2006-03-20 06:53:29.000000000 +0100
 +++ linux-2.6.16-owrt/include/linux/kernel.h   2006-03-20 14:25:10.000000000 +0100