diff options
| author | wdenk <wdenk> | 2004-04-18 17:39:38 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-04-18 17:39:38 +0000 |
| commit | 6e5923851ec5c11a36136abc77160d834537c4dd (patch) | |
| tree | 1d324917e695bf3aadc0041d220304d07d09027a /common/cmd_pcmcia.c | |
| parent | c26e454dfc6650428854fa2db3b1ed7f19e0ba0e (diff) | |
| download | u-boot-6e5923851ec5c11a36136abc77160d834537c4dd.zip u-boot-6e5923851ec5c11a36136abc77160d834537c4dd.tar.gz u-boot-6e5923851ec5c11a36136abc77160d834537c4dd.tar.bz2 | |
* Cleanup, minor fixes
* Patch by Rune Torgersen, 16 Apr 2004:
LBA48 fixes
* Patches by Pantelis Antoniou, 16 Apr 2004:
- Fix some compile problems;
add "once" functionality for the netretry variable
Diffstat (limited to 'common/cmd_pcmcia.c')
| -rw-r--r-- | common/cmd_pcmcia.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/common/cmd_pcmcia.c b/common/cmd_pcmcia.c index 7a2ca9e..9ff0949 100644 --- a/common/cmd_pcmcia.c +++ b/common/cmd_pcmcia.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000-2002 + * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -91,7 +91,7 @@ static int voltage_set(int slot, int vcc, int vpp); #if (! defined(CONFIG_I82365)) && (! defined(CONFIG_PXA_PCMCIA)) static u_int m8xx_get_graycode(u_int size); -#endif /* CONFIG_I82365 */ +#endif /* !CONFIG_I82365, !CONFIG_PXA_PCMCIA */ #if 0 static u_int m8xx_get_speed(u_int ns, u_int is_io); #endif @@ -106,9 +106,10 @@ static u_int *pcmcia_pgcrx[2] = { &((immap_t *)CFG_IMMR)->im_pcmcia.pcmc_pgcra, &((immap_t *)CFG_IMMR)->im_pcmcia.pcmc_pgcrb, }; - #define PCMCIA_PGCRX(slot) (*pcmcia_pgcrx[slot]) +#endif /* CONFIG_PXA_PCMCIA */ + #endif /* CONFIG_I82365 */ #if defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_PXA_PCMCIA) @@ -116,9 +117,7 @@ static void print_funcid (int func); static void print_fixed (volatile uchar *p); static int identify (volatile uchar *p); static int check_ide_device (int slot); -#endif /* CONFIG_IDE_8xx_PCCARD */ - -#endif +#endif /* CONFIG_IDE_8xx_PCCARD, CONFIG_PXA_PCMCIA */ const char *indent = "\t "; |