Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / mmc / wbsd.h

diff --git a/drivers/mmc/wbsd.h b/drivers/mmc/wbsd.h
index 9005b5241b3cce44c132f13be7e9b5270cfc691c..249baa701cb0be7f5930e6282c944f499365119a 100644 (file)
--- a/drivers/mmc/wbsd.h
+++ b/drivers/mmc/wbsd.h
@@ -139,51 +139,50 @@
 struct wbsd_host
 {
        struct mmc_host*        mmc;            /* MMC structure */
-       
+
        spinlock_t              lock;           /* Mutex */
 
        int                     flags;          /* Driver states */
 
 #define WBSD_FCARD_PRESENT     (1<<0)          /* Card is present */
 #define WBSD_FIGNORE_DETECT    (1<<1)          /* Ignore card detection */
-       
+
        struct mmc_request*     mrq;            /* Current request */
-       
+
        u8                      isr;            /* Accumulated ISR */
-       
+
        struct scatterlist*     cur_sg;         /* Current SG entry */
        unsigned int            num_sg;         /* Number of entries left */
        void*                   mapped_sg;      /* vaddr of mapped sg */
-       
+
        unsigned int            offset;         /* Offset into current entry */
        unsigned int            remain;         /* Data left in curren entry */
 
        int                     size;           /* Total size of transfer */
-       
+
        char*                   dma_buffer;     /* ISA DMA buffer */
        dma_addr_t              dma_addr;       /* Physical address for same */
 
        int                     firsterr;       /* See fifo functions */
-       
+
        u8                      clk;            /* Current clock speed */
        unsigned char           bus_width;      /* Current bus width */
-       
+
        int                     config;         /* Config port */
        u8                      unlock_code;    /* Code to unlock config */
 
        int                     chip_id;        /* ID of controller */
-       
+
        int                     base;           /* I/O port base */
        int                     irq;            /* Interrupt */
        int                     dma;            /* DMA channel */
-       
+
        struct tasklet_struct   card_tasklet;   /* Tasklet structures */
        struct tasklet_struct   fifo_tasklet;
        struct tasklet_struct   crc_tasklet;
        struct tasklet_struct   timeout_tasklet;
        struct tasklet_struct   finish_tasklet;
        struct tasklet_struct   block_tasklet;
-       
-       struct timer_list       detect_timer;   /* Card detection timer */
+
        struct timer_list       ignore_timer;   /* Ignore detection timer */
 };