summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-11-04 15:55:23 +0000
committerWolfgang Denk <wd@denx.de>2011-11-07 22:11:49 +0100
commit907ecac7e1bd263f13ce4bd1ca7f158ea3de0f89 (patch)
tree8674d0e00b5b9d86bb26a90bce0a47dc6c4fd910
parent045a96727bd1eac988b979304ba95e4f78d09487 (diff)
downloadtalos-obmc-uboot-907ecac7e1bd263f13ce4bd1ca7f158ea3de0f89.tar.gz
talos-obmc-uboot-907ecac7e1bd263f13ce4bd1ca7f158ea3de0f89.zip
board/c2mon/pcmcia.c: Fix GCC 4.6 build warning
Fix: pcmcia.c: In function 'pcmcia_voltage_set': pcmcia.c:202:21: warning: variable 'cp' set but not used [-Wunused-but-set-variable] Signed-off-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--board/c2mon/pcmcia.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/board/c2mon/pcmcia.c b/board/c2mon/pcmcia.c
index c833b20b7b..2267829039 100644
--- a/board/c2mon/pcmcia.c
+++ b/board/c2mon/pcmcia.c
@@ -199,7 +199,6 @@ int pcmcia_hardware_disable(int slot)
int pcmcia_voltage_set(int slot, int vcc, int vpp)
{
volatile immap_t *immap;
- volatile cpm8xx_t *cp;
volatile pcmconf8xx_t *pcmp;
u_long reg;
ushort sreg;
@@ -210,12 +209,11 @@ int pcmcia_voltage_set(int slot, int vcc, int vpp)
'A'+slot, vcc/10, vcc%10, vpp/10, vcc%10);
immap = (immap_t *)CONFIG_SYS_IMMR;
- cp = (cpm8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_cpm));
pcmp = (pcmconf8xx_t *)(&(((immap_t *)CONFIG_SYS_IMMR)->im_pcmcia));
/*
- * Disable PCMCIA buffers (isolate the interface)
- * and assert RESET signal
- */
+ * Disable PCMCIA buffers (isolate the interface)
+ * and assert RESET signal
+ */
debug ("Disable PCMCIA buffers and assert RESET\n");
reg = PCMCIA_PGCRX(_slot_);
reg |= __MY_PCMCIA_GCRX_CXRESET; /* active high */
OpenPOWER on IntegriCloud