diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-11 09:21:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-11 09:21:28 -0800 |
| commit | 5da38d32824eb27c325d296bf3a39b5946578789 (patch) | |
| tree | fdc0356ea0de6100a2a180fb93db98f752a543a1 /drivers/ata/pata_pcmcia.c | |
| parent | 7e2cec8631b76e123787a57eb8334b95762b8741 (diff) | |
| parent | 19b723218bde79c60a394a3caee9eb156ac2d356 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: fix last_reset timestamp handling
libata: Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
[libata] pata_pcmcia: another memory card support
[libata] pata_sch: notice attached slave devices
[libata] pata_cs553*.c: cleanup kernel-doc
Diffstat (limited to 'drivers/ata/pata_pcmcia.c')
| -rw-r--r-- | drivers/ata/pata_pcmcia.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index 271cb64d429..64b2e2281ee 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c @@ -416,6 +416,7 @@ static struct pcmcia_device_id pcmcia_devices[] = { PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209), PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e), PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6), + PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506), PCMCIA_DEVICE_NULL, }; |