Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6: (180 commits)
  leo: disable cursor when leaving graphics mode
  cg6: disable cursor when leaving graphics mode
  sparc32: sun4m interrupt mask cleanup
  drivers/rtc/Kconfig: don't build rtc-cmos.o on sparc32
  sparc: arch/sparc/kernel/pmc.c -- extra #include?
  sparc32: Add more extensive documentation of sun4m interrupts.
  sparc32: Kill irq_rcvreg from sun4m_irq.c
  sparc32: Delete master_l10_limit.
  sparc32: Use PROM device probing for sun4c timers.
  sparc32: Use PROM device probing for sun4c interrupt register.
  sparc32: Delete claim_ticker14().
  sparc32: Stop calling claim_ticker14() from sun4c_irq.c
  sparc32: Kill clear_profile_irq btfixup entry.
  sparc32: Call sun4m_clear_profile_irq() directly from sun4m_smp.c
  sparc32: Remove #if 0'd code from sun4c_irq.c
  sparc32: Remove some SMP ifdefs in sun4d_irq.c
  sparc32: Use PROM infrastructure for probing and mapping sun4d timers.
  sparc32: Use PROM device probing for sun4m irq registers.
  sparc32: Use PROM device probing for sun4m timer registers.
  sparc: Fix user_regset 'n' field values.
  ...

3 files changed, 27 insertions, 25 deletions

diff --git a/include/linux/rtc/m48t59.h b/include/linux/rtc/m48t59.h
index e8c7c21ceb1f..6fc961459b4a 100644
--- a/include/linux/rtc/m48t59.h
+++ b/include/linux/rtc/m48t59.h
@@ -18,40 +18,47 @@
 /*
  * M48T59 Register Offset
  */
-#define M48T59_YEAR             0x1fff
-#define M48T59_MONTH            0x1ffe
-#define M48T59_MDAY             0x1ffd  /* Day of Month */
-#define M48T59_WDAY             0x1ffc  /* Day of Week */
+#define M48T59_YEAR             0xf
+#define M48T59_MONTH            0xe
+#define M48T59_MDAY             0xd     /* Day of Month */
+#define M48T59_WDAY             0xc     /* Day of Week */
 #define M48T59_WDAY_CB                  0x20    /* Century Bit */
 #define M48T59_WDAY_CEB                 0x10    /* Century Enable Bit */
-#define M48T59_HOUR             0x1ffb
-#define M48T59_MIN              0x1ffa
-#define M48T59_SEC              0x1ff9
-#define M48T59_CNTL             0x1ff8
+#define M48T59_HOUR             0xb
+#define M48T59_MIN              0xa
+#define M48T59_SEC              0x9
+#define M48T59_CNTL             0x8
 #define M48T59_CNTL_READ                0x40
 #define M48T59_CNTL_WRITE               0x80
-#define M48T59_WATCHDOG         0x1ff7
-#define M48T59_INTR             0x1ff6
+#define M48T59_WATCHDOG         0x7
+#define M48T59_INTR             0x6
 #define M48T59_INTR_AFE                 0x80    /* Alarm Interrupt Enable */
 #define M48T59_INTR_ABE                 0x20
-#define M48T59_ALARM_DATE       0x1ff5
-#define M48T59_ALARM_HOUR       0x1ff4
-#define M48T59_ALARM_MIN        0x1ff3
-#define M48T59_ALARM_SEC        0x1ff2
-#define M48T59_UNUSED           0x1ff1
-#define M48T59_FLAGS            0x1ff0
+#define M48T59_ALARM_DATE       0x5
+#define M48T59_ALARM_HOUR       0x4
+#define M48T59_ALARM_MIN        0x3
+#define M48T59_ALARM_SEC        0x2
+#define M48T59_UNUSED           0x1
+#define M48T59_FLAGS            0x0
 #define M48T59_FLAGS_WDT                0x80    /* watchdog timer expired */
 #define M48T59_FLAGS_AF                 0x40    /* alarm */
 #define M48T59_FLAGS_BF                 0x10    /* low battery */
 
-#define M48T59_NVRAM_SIZE       0x1ff0
+#define M48T59RTC_TYPE_M48T59   0 /* to keep compatibility */
+#define M48T59RTC_TYPE_M48T02   1
+#define M48T59RTC_TYPE_M48T08   2
 
 struct m48t59_plat_data {
-        /* The method to access M48T59 registers,
-         * NOTE: The 'ofs' should be 0x00~0x1fff
-         */
+        /* The method to access M48T59 registers */
         void (*write_byte)(struct device *dev, u32 ofs, u8 val);
         unsigned char (*read_byte)(struct device *dev, u32 ofs);
+
+        int type; /* RTC model */
+
+        /* ioaddr mapped externally */
+        void __iomem *ioaddr;
+        /* offset to RTC registers, automatically set according to the type */
+        unsigned int offset;
 };
 
 #endif /* _LINUX_RTC_M48T59_H_ */
diff --git a/include/sound/core.h b/include/sound/core.h
index e5eec5f73502..35424a971b7a 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -43,9 +43,6 @@
 #ifdef CONFIG_PCI
 struct pci_dev;
 #endif
-#ifdef CONFIG_SBUS
-struct sbus_dev;
-#endif
 
 /* device allocation stuff */
 
diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h
index d787a6b4a101..7ccce94a5255 100644
--- a/include/sound/memalloc.h
+++ b/include/sound/memalloc.h
@@ -37,7 +37,6 @@ struct snd_dma_device {
 #ifndef snd_dma_pci_data
 #define snd_dma_pci_data(pci)   (&(pci)->dev)
 #define snd_dma_isa_data()      NULL
-#define snd_dma_sbus_data(sbus) ((struct device *)(sbus))
 #define snd_dma_continuous_data(x)      ((struct device *)(unsigned long)(x))
 #endif
 
@@ -49,7 +48,6 @@ struct snd_dma_device {
 #define SNDRV_DMA_TYPE_CONTINUOUS       1       /* continuous no-DMA memory */
 #define SNDRV_DMA_TYPE_DEV              2       /* generic device continuous */
 #define SNDRV_DMA_TYPE_DEV_SG           3       /* generic device SG-buffer */
-#define SNDRV_DMA_TYPE_SBUS             4       /* SBUS continuous */
 
 /*
  * info for buffer allocation