diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-07-21 15:24:56 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-07-21 15:24:56 +0200 |
| commit | 966083e95f5ba2bf4a1723b19313e69c14b60092 (patch) | |
| tree | 511a1ed8d7147e38a8437a2afa26dcc221b0c471 /drivers | |
| parent | 144f7795eefae2997dbac461fc150fe9bd9057c8 (diff) | |
More code cleanup
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mpc8xx_pcmcia.c | 2 | ||||
| -rw-r--r-- | drivers/ps2ser.c | 2 | ||||
| -rw-r--r-- | drivers/rpx_pcmcia.c | 2 | ||||
| -rw-r--r-- | drivers/tqm8xx_pcmcia.c | 8 |
4 files changed, 10 insertions, 4 deletions
diff --git a/drivers/mpc8xx_pcmcia.c b/drivers/mpc8xx_pcmcia.c index 1fb106f511..399a719e56 100644 --- a/drivers/mpc8xx_pcmcia.c +++ b/drivers/mpc8xx_pcmcia.c @@ -1,5 +1,7 @@ #include <common.h> +#if defined(CONFIG_8xx) #include <mpc8xx.h> +#endif #include <pcmcia.h> #undef CONFIG_PCMCIA diff --git a/drivers/ps2ser.c b/drivers/ps2ser.c index ec32ed2df4..4e304f7407 100644 --- a/drivers/ps2ser.c +++ b/drivers/ps2ser.c @@ -20,7 +20,7 @@ #include <asm/io.h> #include <asm/atomic.h> #include <ps2mult.h> -#ifdef CFG_NS16550 +#if defined(CFG_NS16550) || defined(CONFIG_MPC85xx) #include <ns16550.h> #endif diff --git a/drivers/rpx_pcmcia.c b/drivers/rpx_pcmcia.c index 01ff1d45ba..2a0a9e05a2 100644 --- a/drivers/rpx_pcmcia.c +++ b/drivers/rpx_pcmcia.c @@ -2,7 +2,9 @@ /* RPX Boards from Embedded Planet */ /* -------------------------------------------------------------------- */ #include <common.h> +#ifdef CONFIG_8xx #include <mpc8xx.h> +#endif #include <pcmcia.h> #undef CONFIG_PCMCIA diff --git a/drivers/tqm8xx_pcmcia.c b/drivers/tqm8xx_pcmcia.c index b5b93088d4..a0f53cd684 100644 --- a/drivers/tqm8xx_pcmcia.c +++ b/drivers/tqm8xx_pcmcia.c @@ -3,7 +3,9 @@ /* SC8xx Boards by SinoVee Microsystems */ /* -------------------------------------------------------------------- */ #include <common.h> +#ifdef CONFIG_8xx #include <mpc8xx.h> +#endif #include <pcmcia.h> #undef CONFIG_PCMCIA @@ -242,8 +244,6 @@ int pcmcia_hardware_enable(int slot) #if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) int pcmcia_hardware_disable(int slot) { - volatile pcmconf8xx_t *pcmp = - (pcmconf8xx_t *)(&(((immap_t *)CFG_IMMR)->im_pcmcia)); u_long reg; debug ("hardware_disable: " PCMCIA_BOARD_MSG " Slot %c\n", 'A'+slot); @@ -268,9 +268,11 @@ int pcmcia_hardware_disable(int slot) int pcmcia_voltage_set(int slot, int vcc, int vpp) { #ifndef CONFIG_NSCU + u_long reg; +# ifdef DEBUG volatile pcmconf8xx_t *pcmp = (pcmconf8xx_t *)(&(((immap_t *)CFG_IMMR)->im_pcmcia)); - u_long reg; +# endif debug ("voltage_set: " PCMCIA_BOARD_MSG " Slot %c, Vcc=%d.%d, Vpp=%d.%d\n", |