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

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23:
  sh: Fix fs.h removal from mm.h regressions.
  sh: fix get_wchan() for SH kernels without framepointers
  sh: arch/sh/boot - fix shell usage
  rtc: rtc-sh: Correct sh_rtc_set_time() for some SH-3 parts.
  sh: remove support for sh7300 and solution engine 7300
  sh: Add sh to the CC_OPTIMIZE_FOR_SIZE dependencies.
  sh: Kill off virt_to_bus()/bus_to_virt().
  sh: sh-sci - fix SH7708 support
  sh: Restrict DSP support to specific CPUs.
  sh: Silence sq compile warning on sh4 nommu.
  sh: Kill the rest of the SE73180 cruft.
  sh: remove support for sh73180 and solution engine 73180
  sh: remove old broken pint code
  sh: Reclaim beginning of P3 space for vmalloc area.
  sh: Fix Dreamcast DMA issues.
  sh: Add kmap_coherent()/kunmap_coherent() interface for SH-4.

1 files changed, 4 insertions, 3 deletions

diff --git a/arch/sh/drivers/dma/dma-api.c b/arch/sh/drivers/dma/dma-api.c
index cf8e11994330..76ed816d9a24 100644
--- a/arch/sh/drivers/dma/dma-api.c
+++ b/arch/sh/drivers/dma/dma-api.c
@@ -31,8 +31,8 @@ struct dma_info *get_dma_info(unsigned int chan)
          * the channel is.
          */
         list_for_each_entry(info, &registered_dmac_list, list) {
-                if ((chan <  info->first_channel_nr) ||
-                    (chan >= info->first_channel_nr + info->nr_channels))
+                if ((chan <  info->first_vchannel_nr) ||
+                    (chan >= info->first_vchannel_nr + info->nr_channels))
                         continue;
 
                 return info;
@@ -82,7 +82,7 @@ struct dma_channel *get_dma_channel(unsigned int chan)
 
         for (i = 0; i < info->nr_channels; i++) {
                 channel = &info->channels[i];
-                if (channel->chan == chan)
+                if (channel->vchan == chan)
                         return channel;
         }
 
@@ -369,6 +369,7 @@ int register_dmac(struct dma_info *info)
         }
 
         total_channels = get_nr_channels();
+        info->first_vchannel_nr = total_channels;
         for (i = 0; i < info->nr_channels; i++) {
                 struct dma_channel *chan = &info->channels[i];