diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 19:41:21 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 19:41:21 -0400 |
| commit | ae1d3b974e091b5fc9008bd41bcbdaac68110b62 (patch) | |
| tree | 82e50a66925ced79f59ed4504f6e073ef55edee3 /drivers/mmc | |
| parent | 586893ebc42943008010b4c210cfc9167df615e5 (diff) | |
| parent | 7a2207a0e1142a9b214b323e43ab2ecc592e5b0e (diff) | |
Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdricoh_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdricoh_cs.c b/drivers/mmc/host/sdricoh_cs.c index bbc298fd2a15..496b7efbc6b0 100644 --- a/drivers/mmc/host/sdricoh_cs.c +++ b/drivers/mmc/host/sdricoh_cs.c | |||
| @@ -76,7 +76,7 @@ static unsigned int switchlocked; | |||
| 76 | #define BUSY_TIMEOUT 32767 | 76 | #define BUSY_TIMEOUT 32767 |
| 77 | 77 | ||
| 78 | /* list of supported pcmcia devices */ | 78 | /* list of supported pcmcia devices */ |
| 79 | static struct pcmcia_device_id pcmcia_ids[] = { | 79 | static const struct pcmcia_device_id pcmcia_ids[] = { |
| 80 | /* vendor and device strings followed by their crc32 hashes */ | 80 | /* vendor and device strings followed by their crc32 hashes */ |
| 81 | PCMCIA_DEVICE_PROD_ID12("RICOH", "Bay1Controller", 0xd9f522ed, | 81 | PCMCIA_DEVICE_PROD_ID12("RICOH", "Bay1Controller", 0xd9f522ed, |
| 82 | 0xc3901202), | 82 | 0xc3901202), |