diff options
author | Pierre Ossman <drzeus@drzeus.cx> | 2008-03-08 17:44:25 -0500 |
---|---|---|
committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-04-18 14:05:27 -0400 |
commit | b69c9058907642f8e1b32076906755c6623ea060 (patch) | |
tree | a31be65a3b91a78abc29f9dc7b76075086710948 /drivers/mmc/host/sdhci.h | |
parent | ff3112f5adcc9dc33c107c826f82017db8f889f5 (diff) |
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.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index d5a38f1b755..3288e209ba4 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * linux/drivers/mmc/host/sdhci.h - Secure Digital Host Controller Interface driver | 2 | * linux/drivers/mmc/host/sdhci.h - Secure Digital Host Controller Interface driver |
3 | * | 3 | * |
4 | * Copyright (C) 2005-2007 Pierre Ossman, All Rights Reserved. | 4 | * Copyright (C) 2005-2008 Pierre Ossman, All Rights Reserved. |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
7 | * it under the terms of the GNU General Public License as published by | 7 | * it under the terms of the GNU General Public License as published by |
@@ -190,8 +190,6 @@ struct sdhci_host { | |||
190 | int offset; /* Offset into current sg */ | 190 | int offset; /* Offset into current sg */ |
191 | int remain; /* Bytes left in current */ | 191 | int remain; /* Bytes left in current */ |
192 | 192 | ||
193 | char slot_descr[20]; /* Name for reservations */ | ||
194 | |||
195 | int irq; /* Device IRQ */ | 193 | int irq; /* Device IRQ */ |
196 | int bar; /* PCI BAR index */ | 194 | int bar; /* PCI BAR index */ |
197 | unsigned long addr; /* Bus address */ | 195 | unsigned long addr; /* Bus address */ |
@@ -208,7 +206,6 @@ struct sdhci_chip { | |||
208 | 206 | ||
209 | unsigned long quirks; | 207 | unsigned long quirks; |
210 | 208 | ||
211 | int index; /* Index for chip0, chip1 ...*/ | ||
212 | int num_slots; /* Slots on controller */ | 209 | int num_slots; /* Slots on controller */ |
213 | struct sdhci_host *hosts[0]; /* Pointers to hosts */ | 210 | struct sdhci_host *hosts[0]; /* Pointers to hosts */ |
214 | }; | 211 | }; |