Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (33 commits)
  [MIPS] Add missing backslashes to macro definitions.
  [MIPS] Death list of board support to be removed after 2.6.18.
  [MIPS] Remove BSD and Sys V compat data types.
  [MIPS] ioc3.h: Uses u8, so include <linux/types.h>.
  [MIPS] 74K: Assume it will also have an AR bit in config7
  [MIPS] Treat CPUs with AR bit as physically indexed.
  [MIPS] Oprofile: Support VSMP on 34K.
  [MIPS] MIPS32/MIPS64 S-cache fix and cleanup
  [MIPS] excite: PCI makefile needs to use += if it wants a chance to work.
  [MIPS] excite: plat_setup -> plat_mem_setup.
  [MIPS] au1xxx: export dbdma functions
  [MIPS] au1xxx: dbdma, no sleeping under spin_lock
  [MIPS] au1xxx: fix PSC_SMBTXRX_RSR.
  [MIPS] Early printk for IP27.
  [MIPS] Fix handling of 0 length I & D caches.
  [MIPS] Typo fixes.
  [MIPS] MIPS32/MIPS64 secondary cache management
  [MIPS] Fix FIXADDR_TOP for TX39/TX49.
  [MIPS] Remove first timer interrupt setup in wrppmc_timer_setup()
  [MIPS] Fix configuration of R2 CPU features and multithreading.
  ...

3 files changed, 6 insertions, 6 deletions

diff --git a/arch/mips/momentum/jaguar_atx/setup.c b/arch/mips/momentum/jaguar_atx/setup.c
index df1485501ce6..d0419480b097 100644
--- a/arch/mips/momentum/jaguar_atx/setup.c
+++ b/arch/mips/momentum/jaguar_atx/setup.c
@@ -370,8 +370,8 @@ void __init plat_mem_setup(void)
         pm_power_off = momenco_jaguar_power_off;
 
         /*
-         * initrd_start = (ulong)jaguar_initrd_start;
-         * initrd_end = (ulong)jaguar_initrd_start + (ulong)jaguar_initrd_size;
+         * initrd_start = (unsigned long)jaguar_initrd_start;
+         * initrd_end = (unsigned long)jaguar_initrd_start + (ulong)jaguar_initrd_size;
          * initrd_below_start_ok = 1;
          */
 
diff --git a/arch/mips/momentum/ocelot_c/setup.c b/arch/mips/momentum/ocelot_c/setup.c
index 257e1d1b72dd..a0ee006d75cf 100644
--- a/arch/mips/momentum/ocelot_c/setup.c
+++ b/arch/mips/momentum/ocelot_c/setup.c
@@ -242,8 +242,8 @@ void __init plat_mem_setup(void)
         pm_power_off = momenco_ocelot_power_off;
 
         /*
-         * initrd_start = (ulong)ocelot_initrd_start;
-         * initrd_end = (ulong)ocelot_initrd_start + (ulong)ocelot_initrd_size;
+         * initrd_start = (unsigned long)ocelot_initrd_start;
+         * initrd_end = (unsigned long)ocelot_initrd_start + (ulong)ocelot_initrd_size;
          * initrd_below_start_ok = 1;
          */
 
diff --git a/arch/mips/momentum/ocelot_g/setup.c b/arch/mips/momentum/ocelot_g/setup.c
index 72143ab1e900..39da02b4e076 100644
--- a/arch/mips/momentum/ocelot_g/setup.c
+++ b/arch/mips/momentum/ocelot_g/setup.c
@@ -174,8 +174,8 @@ void __init plat_mem_setup(void)
         pm_power_off = momenco_ocelot_power_off;
 
         /*
-         * initrd_start = (ulong)ocelot_initrd_start;
-         * initrd_end = (ulong)ocelot_initrd_start + (ulong)ocelot_initrd_size;
+         * initrd_start = (unsigned long)ocelot_initrd_start;
+         * initrd_end = (unsigned long)ocelot_initrd_start + (ulong)ocelot_initrd_size;
          * initrd_below_start_ok = 1;
          */