Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / drivers / mmc / host / sdhci.h

diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index d5a38f1b755ae1855cca9a0d40713fe3a7c77d65..7fb02e177a3d13cd4b3439486b8dfb297bec2756 100644 (file)
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -1,7 +1,7 @@
 /*
  *  linux/drivers/mmc/host/sdhci.h - Secure Digital Host Controller Interface driver
  *
- *  Copyright (C) 2005-2007 Pierre Ossman, All Rights Reserved.
+ *  Copyright (C) 2005-2008 Pierre Ossman, All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -168,6 +168,10 @@ struct sdhci_host {
        struct sdhci_chip       *chip;
        struct mmc_host         *mmc;           /* MMC structure */
 
+#ifdef CONFIG_LEDS_CLASS
+       struct led_classdev     led;            /* LED control */
+#endif
+
        spinlock_t              lock;           /* Mutex */
 
        int                     flags;          /* Host attributes */
@@ -190,8 +194,6 @@ struct sdhci_host {
        int                     offset;         /* Offset into current sg */
        int                     remain;         /* Bytes left in current */
 
-       char                    slot_descr[20]; /* Name for reservations */
-
        int                     irq;            /* Device IRQ */
        int                     bar;            /* PCI BAR index */
        unsigned long           addr;           /* Bus address */
@@ -208,7 +210,6 @@ struct sdhci_chip {
 
        unsigned long           quirks;
 
-       int                     index;          /* Index for chip0, chip1 ...*/
        int                     num_slots;      /* Slots on controller */
        struct sdhci_host       *hosts[0];      /* Pointers to hosts */
 };