Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux.git] / include / linux / mv643xx.h

diff --git a/include/linux/mv643xx.h b/include/linux/mv643xx.h
index 4471cf96ef6990588364973506101023a6326b02..47e5679b48e15fc14cdd8843d24d3915c6273c3b 100644 (file)
--- a/include/linux/mv643xx.h
+++ b/include/linux/mv643xx.h
@@ -918,52 +918,6 @@
 
 extern void mv64340_irq_init(unsigned int base);
 
-/* MPSC Platform Device, Driver Data (Shared register regions) */
-#define        MPSC_SHARED_NAME                "mpsc_shared"
-
-#define        MPSC_ROUTING_BASE_ORDER         0
-#define        MPSC_SDMA_INTR_BASE_ORDER       1
-
-#define MPSC_ROUTING_REG_BLOCK_SIZE    0x000c
-#define MPSC_SDMA_INTR_REG_BLOCK_SIZE  0x0084
-
-struct mpsc_shared_pdata {
-       u32     mrr_val;
-       u32     rcrr_val;
-       u32     tcrr_val;
-       u32     intr_cause_val;
-       u32     intr_mask_val;
-};
-
-/* MPSC Platform Device, Driver Data */
-#define        MPSC_CTLR_NAME                  "mpsc"
-
-#define        MPSC_BASE_ORDER                 0
-#define        MPSC_SDMA_BASE_ORDER            1
-#define        MPSC_BRG_BASE_ORDER             2
-
-#define MPSC_REG_BLOCK_SIZE            0x0038
-#define MPSC_SDMA_REG_BLOCK_SIZE       0x0c18
-#define MPSC_BRG_REG_BLOCK_SIZE                0x0008
-
-struct mpsc_pdata {
-       u8      mirror_regs;
-       u8      cache_mgmt;
-       u8      max_idle;
-       int     default_baud;
-       int     default_bits;
-       int     default_parity;
-       int     default_flow;
-       u32     chr_1_val;
-       u32     chr_2_val;
-       u32     chr_10_val;
-       u32     mpcr_val;
-       u32     bcr_val;
-       u8      brg_can_tune;
-       u8      brg_clk_src;
-       u32     brg_clk_freq;
-};
-
 /* Watchdog Platform Device, Driver Data */
 #define        MV64x60_WDT_NAME                        "mv64x60_wdt"