Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (454 commits)
  [POWERPC] Cell IOMMU fixed mapping support
  [POWERPC] Split out the ioid fetching/checking logic
  [POWERPC] Add support to cell_iommu_setup_page_tables() for multiple windows
  [POWERPC] Split out the IOMMU logic from cell_dma_dev_setup()
  [POWERPC] Split cell_iommu_setup_hardware() into two parts
  [POWERPC] Split out the logic that allocates struct iommus
  [POWERPC] Allocate the hash table under 1G on cell
  [POWERPC] Add set_dma_ops() to match get_dma_ops()
  [POWERPC] 83xx: Clean up / convert mpc83xx board DTS files to v1 format.
  [POWERPC] 85xx: Only invalidate TLB0 and TLB1
  [POWERPC] 83xx: Fix typo in mpc837x compatible entries
  [POWERPC] 85xx: convert sbc85* boards to use machine_device_initcall
  [POWERPC] 83xx: rework platform Kconfig
  [POWERPC] 85xx: rework platform Kconfig
  [POWERPC] 86xx: Remove unused IRQ defines
  [POWERPC] QE: Explicitly set address-cells and size cells for muram
  [POWERPC] Convert StorCenter DTS file to /dts-v1/ format.
  [POWERPC] 86xx: Convert all 86xx DTS files to /dts-v1/ format.
  [PPC] Remove 85xx from arch/ppc
  [PPC] Remove 83xx from arch/ppc
  ...

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/ps3/ps3-sys-manager.c b/drivers/ps3/ps3-sys-manager.c
index 8461b08ab9fb..c3c3aba3ffce 100644
--- a/drivers/ps3/ps3-sys-manager.c
+++ b/drivers/ps3/ps3-sys-manager.c
@@ -452,7 +452,7 @@ static int ps3_sys_manager_handle_event(struct ps3_system_bus_device *dev)
         case PS3_SM_EVENT_THERMAL_ALERT:
                 dev_dbg(&dev->core, "%s:%d: THERMAL_ALERT (zone %u)\n",
                         __func__, __LINE__, event.value);
-                printk(KERN_INFO "PS3 Thermal Alert Zone %u\n", event.value);
+                pr_info("PS3 Thermal Alert Zone %u\n", event.value);
                 break;
         case PS3_SM_EVENT_THERMAL_CLEARED:
                 dev_dbg(&dev->core, "%s:%d: THERMAL_CLEARED (zone %u)\n",
@@ -488,7 +488,7 @@ static int ps3_sys_manager_handle_cmd(struct ps3_system_bus_device *dev)
         result = ps3_vuart_read(dev, &cmd, sizeof(cmd));
         BUG_ON(result && "need to retry here");
 
-        if(result)
+        if (result)
                 return result;
 
         if (cmd.version != 1) {
@@ -521,7 +521,7 @@ static int ps3_sys_manager_handle_msg(struct ps3_system_bus_device *dev)
         result = ps3_vuart_read(dev, &header,
                 sizeof(struct ps3_sys_manager_header));
 
-        if(result)
+        if (result)
                 return result;
 
         if (header.version != 1) {
@@ -589,9 +589,9 @@ static void ps3_sys_manager_final_power_off(struct ps3_system_bus_device *dev)
                 PS3_SM_WAKE_DEFAULT);
         ps3_sys_manager_send_request_shutdown(dev);
 
-        printk(KERN_EMERG "System Halted, OK to turn off power\n");
+        pr_emerg("System Halted, OK to turn off power\n");
 
-        while(1)
+        while (1)
                 ps3_sys_manager_handle_msg(dev);
 }
 
@@ -626,9 +626,9 @@ static void ps3_sys_manager_final_restart(struct ps3_system_bus_device *dev)
                 PS3_SM_WAKE_DEFAULT);
         ps3_sys_manager_send_request_shutdown(dev);
 
-        printk(KERN_EMERG "System Halted, OK to turn off power\n");
+        pr_emerg("System Halted, OK to turn off power\n");
 
-        while(1)
+        while (1)
                 ps3_sys_manager_handle_msg(dev);
 }