summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sdhci.h
diff options
context:
space:
mode:
authorPierre Ossman2008-03-08 23:44:25 +0100
committerPierre Ossman2008-04-18 20:05:27 +0200
commitb69c9058907642f8e1b32076906755c6623ea060 (patch)
treea31be65a3b91a78abc29f9dc7b76075086710948 /drivers/mmc/host/sdhci.h
parentmmc: set controller name early (diff)
downloadkernel-qcow2-linux-b69c9058907642f8e1b32076906755c6623ea060.tar.gz
kernel-qcow2-linux-b69c9058907642f8e1b32076906755c6623ea060.tar.xz
kernel-qcow2-linux-b69c9058907642f8e1b32076906755c6623ea060.zip
sdhci: remove custom controller name
Remove the use of the sdhci specific device name and use the mmc controller name instead. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc/host/sdhci.h')
-rw-r--r--drivers/mmc/host/sdhci.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index d5a38f1b755a..3288e209ba44 100644
--- 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
@@ -190,8 +190,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 +206,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 */
};