diff options
author | Jon Loeliger <jdl@freescale.com> | 2006-08-09 13:36:54 -0500 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2006-08-09 13:36:54 -0500 |
commit | 281f69ede28cd3d8be5d62a96b5a0b73e6065858 (patch) | |
tree | 8f1a0f42ce7d9c66d0ff2ecf93c9b069cbc68cc0 /include/pcmcia.h | |
parent | 870cbeaa45ccdbd6566882741da9f82433bd4a86 (diff) | |
parent | 6587f7e1e98bfcb7910a47bae2eb51e9a5fbd4da (diff) | |
download | u-boot-imx-281f69ede28cd3d8be5d62a96b5a0b73e6065858.zip u-boot-imx-281f69ede28cd3d8be5d62a96b5a0b73e6065858.tar.gz u-boot-imx-281f69ede28cd3d8be5d62a96b5a0b73e6065858.tar.bz2 |
Merge branch 'wd'
Diffstat (limited to 'include/pcmcia.h')
-rw-r--r-- | include/pcmcia.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/pcmcia.h b/include/pcmcia.h index 43d4510..8f564da 100644 --- a/include/pcmcia.h +++ b/include/pcmcia.h @@ -308,4 +308,14 @@ typedef struct { #endif /* CFG_CMD_PCMCIA || CFG_CMD_IDE && (CONFIG_IDE_8xx_PCCARD || CONFIG_IDE_8xx_DIRECT) */ +#ifdef CONFIG_8xx +extern u_int *pcmcia_pgcrx[]; +#define PCMCIA_PGCRX(slot) (*pcmcia_pgcrx[slot]) +#endif + +#if (CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD) \ + || defined(CONFIG_PXA_PCMCIA) +extern int check_ide_device(int slot); +#endif + #endif /* _PCMCIA_H */ |