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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (80 commits)
  [MIPS] tlbex.c: Cleanup __init usage.
  [MIPS] WRPPMC serial support move to platform device
  [MIPS] R1: Fix hazard barriers to make kernels work on R2 also.
  [MIPS] VPE: reimplement ELF loader.
  [MIPS] cleanup WRPPMC include files
  [MIPS] Add BUG_ON assertion for attempt to run kernel on the wrong CPU type.
  [MIPS] SMP: Use ISO C struct initializer for local structs.
  [MIPS] SMP: Kill useless casts.
  [MIPS] Kill num_online_cpus() loops.
  [MIPS] SMP: Implement smp_call_function_mask().
  [MIPS] Make facility to convert CPU types to strings generally available.
  [MIPS] Convert list of CPU types from #define to enum.
  [MIPS] Optimize get_unaligned / put_unaligned implementations.
  [MIPS] checkfiles: Fix "need space after that ','" errors.
  [MIPS] Fix "no space between function name and open parenthesis" warnings.
  [MIPS] Allow hardwiring of the CPU type to a single type for optimization.
  [MIPS] tlbex: Size optimize code by declaring a few functions inline.
  [MIPS] pg-r4k.c: Dump the generated code
  [MIPS] Cobalt: Remove cobalt_machine_power_off()
  [MIPS] Cobalt: Move reset port definition to arch/mips/cobalt/reset.c
  ...

1 files changed, 21 insertions, 21 deletions

diff --git a/arch/mips/kernel/irixinv.c b/arch/mips/kernel/irixinv.c
index de8584f62311..cf2dcd3d6a93 100644
--- a/arch/mips/kernel/irixinv.c
+++ b/arch/mips/kernel/irixinv.c
@@ -14,7 +14,7 @@ int inventory_items = 0;
 
 static inventory_t inventory [MAX_INVENTORY];
 
-void add_to_inventory (int class, int type, int controller, int unit, int state)
+void add_to_inventory(int class, int type, int controller, int unit, int state)
 {
         inventory_t *ni = &inventory [inventory_items];
 
@@ -30,7 +30,7 @@ void add_to_inventory (int class, int type, int controller, int unit, int state)
         inventory_items++;
 }
 
-int dump_inventory_to_user (void __user *userbuf, int size)
+int dump_inventory_to_user(void __user *userbuf, int size)
 {
         inventory_t *inv  = &inventory [0];
         inventory_t __user *user = userbuf;
@@ -45,7 +45,7 @@ int dump_inventory_to_user (void __user *userbuf, int size)
                         return -EFAULT;
                 user++;
         }
-        return inventory_items * sizeof (inventory_t);
+        return inventory_items * sizeof(inventory_t);
 }
 
 int __init init_inventory(void)
@@ -55,24 +55,24 @@ int __init init_inventory(void)
          * most likely this will not let just anyone run the X server
          * until we put the right values all over the place
          */
-        add_to_inventory (10, 3, 0, 0, 16400);
-        add_to_inventory (1, 1, 150, -1, 12);
-        add_to_inventory (1, 3, 0, 0, 8976);
-        add_to_inventory (1, 2, 0, 0, 8976);
-        add_to_inventory (4, 8, 0, 0, 2);
-        add_to_inventory (5, 5, 0, 0, 1);
-        add_to_inventory (3, 3, 0, 0, 32768);
-        add_to_inventory (3, 4, 0, 0, 32768);
-        add_to_inventory (3, 8, 0, 0, 524288);
-        add_to_inventory (3, 9, 0, 0, 64);
-        add_to_inventory (3, 1, 0, 0, 67108864);
-        add_to_inventory (12, 3, 0, 0, 16);
-        add_to_inventory (8, 7, 17, 0, 16777472);
-        add_to_inventory (8, 0, 0, 0, 1);
-        add_to_inventory (2, 1, 0, 13, 2);
-        add_to_inventory (2, 2, 0, 2, 0);
-        add_to_inventory (2, 2, 0, 1, 0);
-        add_to_inventory (7, 14, 0, 0, 6);
+        add_to_inventory(10, 3, 0, 0, 16400);
+        add_to_inventory(1, 1, 150, -1, 12);
+        add_to_inventory(1, 3, 0, 0, 8976);
+        add_to_inventory(1, 2, 0, 0, 8976);
+        add_to_inventory(4, 8, 0, 0, 2);
+        add_to_inventory(5, 5, 0, 0, 1);
+        add_to_inventory(3, 3, 0, 0, 32768);
+        add_to_inventory(3, 4, 0, 0, 32768);
+        add_to_inventory(3, 8, 0, 0, 524288);
+        add_to_inventory(3, 9, 0, 0, 64);
+        add_to_inventory(3, 1, 0, 0, 67108864);
+        add_to_inventory(12, 3, 0, 0, 16);
+        add_to_inventory(8, 7, 17, 0, 16777472);
+        add_to_inventory(8, 0, 0, 0, 1);
+        add_to_inventory(2, 1, 0, 13, 2);
+        add_to_inventory(2, 2, 0, 2, 0);
+        add_to_inventory(2, 2, 0, 1, 0);
+        add_to_inventory(7, 14, 0, 0, 6);
 
         return 0;
 }