diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:55:47 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:55:47 -0500 |
| commit | b71d4da092801634d04190693a38ca03bdbe2505 (patch) | |
| tree | e4adc88ade5832b844768c114b15d4d97253c4d0 /drivers/pcmcia/m32r_cfc.c | |
| parent | 656563e32c3f1dfdc35b3944305ece1c5dfeade5 (diff) | |
| parent | 624f54be206adf970cd8eece16446b027913e533 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/pcmcia/m32r_cfc.c')
| -rw-r--r-- | drivers/pcmcia/m32r_cfc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c index 2c22b4b3619d..078579ae6359 100644 --- a/drivers/pcmcia/m32r_cfc.c +++ b/drivers/pcmcia/m32r_cfc.c | |||
| @@ -355,9 +355,10 @@ static void add_pcc_socket(ulong base, int irq, ulong mapaddr, kio_addr_t ioaddr | |||
| 355 | #ifndef CONFIG_PLAT_USRV | 355 | #ifndef CONFIG_PLAT_USRV |
| 356 | /* insert interrupt */ | 356 | /* insert interrupt */ |
| 357 | request_irq(irq, pcc_interrupt, 0, "m32r_cfc", pcc_interrupt); | 357 | request_irq(irq, pcc_interrupt, 0, "m32r_cfc", pcc_interrupt); |
| 358 | #ifndef CONFIG_PLAT_MAPPI3 | ||
| 358 | /* eject interrupt */ | 359 | /* eject interrupt */ |
| 359 | request_irq(irq+1, pcc_interrupt, 0, "m32r_cfc", pcc_interrupt); | 360 | request_irq(irq+1, pcc_interrupt, 0, "m32r_cfc", pcc_interrupt); |
| 360 | 361 | #endif | |
| 361 | debug(3, "m32r_cfc: enable CFMSK, RDYSEL\n"); | 362 | debug(3, "m32r_cfc: enable CFMSK, RDYSEL\n"); |
| 362 | pcc_set(pcc_sockets, (unsigned int)PLD_CFIMASK, 0x01); | 363 | pcc_set(pcc_sockets, (unsigned int)PLD_CFIMASK, 0x01); |
| 363 | #endif /* CONFIG_PLAT_USRV */ | 364 | #endif /* CONFIG_PLAT_USRV */ |