Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (137 commits)
  sh: include empty zero page in romImage
  sh: Make associative cache writes fatal on all SH-4A parts.
  sh: Drop associative writes for SH-4 cache flushes.
  sh: Partial revert of copy/clear_user_highpage() optimizations.
  sh: Add default uImage rule for se7724, ap325rxa, and migor.
  sh: allow runtime pm without suspend/resume callbacks
  sh: mach-ecovec24: Remove un-defined settings for VPU
  sh: mach-ecovec24: LCDC drive ability become high
  sh: fix sh7724 VEU3F resource size
  serial: sh-sci: Fix too early port disabling.
  sh: pfc: pr_info() -> pr_debug() cleanups.
  sh: pfc: Convert from ctrl_xxx() to __raw_xxx() I/O routines.
  sh: Improve kfr2r09 serial port setup code
  sh: Break out SuperH PFC code
  sh: Move KEYSC header file
  sh: convert /proc/cpu/aligmnent, /proc/cpu/kernel_alignment to seq_file
  sh: Add CPG save/restore code for sh7724 R-standby
  sh: Add SDHI power control support to Ecovec
  mfd: Add power control platform data to SDHI driver
  sh: mach-ecovec24: modify address map
  ...

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index a762283d2a2..e789e6c9a42 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -214,7 +214,7 @@ static void gdrom_spicommand(void *spi_string, int buflen)
                 gdrom_getsense(NULL);
                 return;
         }
-        outsw(PHYSADDR(GDROM_DATA_REG), cmd, 6);
+        outsw(GDROM_DATA_REG, cmd, 6);
 }
 
 
@@ -298,7 +298,7 @@ static int gdrom_readtoc_cmd(struct gdromtoc *toc, int session)
                 err = -EINVAL;
                 goto cleanup_readtoc;
         }
-        insw(PHYSADDR(GDROM_DATA_REG), toc, tocsize/2);
+        insw(GDROM_DATA_REG, toc, tocsize/2);
         if (gd.status & 0x01)
                 err = -EINVAL;
 
@@ -449,7 +449,7 @@ static int gdrom_getsense(short *bufstring)
                 GDROM_DEFAULT_TIMEOUT);
         if (gd.pending)
                 goto cleanup_sense;
-        insw(PHYSADDR(GDROM_DATA_REG), &sense, sense_command->buflen/2);
+        insw(GDROM_DATA_REG, &sense, sense_command->buflen/2);
         if (sense[1] & 40) {
                 printk(KERN_INFO "GDROM: Drive not ready - command aborted\n");
                 goto cleanup_sense;
@@ -586,7 +586,7 @@ static void gdrom_readdisk_dma(struct work_struct *work)
                 spin_unlock(&gdrom_lock);
                 block = blk_rq_pos(req)/GD_TO_BLK + GD_SESSION_OFFSET;
                 block_cnt = blk_rq_sectors(req)/GD_TO_BLK;
-                ctrl_outl(PHYSADDR(req->buffer), GDROM_DMA_STARTADDR_REG);
+                ctrl_outl(virt_to_phys(req->buffer), GDROM_DMA_STARTADDR_REG);
                 ctrl_outl(block_cnt * GDROM_HARD_SECTOR, GDROM_DMA_LENGTH_REG);
                 ctrl_outl(1, GDROM_DMA_DIRECTION_REG);
                 ctrl_outl(1, GDROM_DMA_ENABLE_REG);
@@ -615,7 +615,7 @@ static void gdrom_readdisk_dma(struct work_struct *work)
                         cpu_relax();
                 gd.pending = 1;
                 gd.transfer = 1;
-                outsw(PHYSADDR(GDROM_DATA_REG), &read_command->cmd, 6);
+                outsw(GDROM_DATA_REG, &read_command->cmd, 6);
                 timeout = jiffies + HZ / 2;
                 /* Wait for any pending DMA to finish */
                 while (ctrl_inb(GDROM_DMA_STATUS_REG) &&