diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-06-06 10:48:31 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-06-06 10:48:31 -0500 |
| commit | 1a247ba7fa5fb09f56892a09a990f03ce564b3e2 (patch) | |
| tree | 9dab0ef013cc6dc7883454808ecf6ba4d7a7a94e /board/fads/pcmcia.c | |
| parent | 2c289e320dcfb3760e99cf1d765cb067194a1202 (diff) | |
| parent | 8155efbd7ae9c65564ca98affe94631d612ae088 (diff) | |
| download | blackbird-obmc-uboot-1a247ba7fa5fb09f56892a09a990f03ce564b3e2.tar.gz blackbird-obmc-uboot-1a247ba7fa5fb09f56892a09a990f03ce564b3e2.zip | |
Merge commit 'wd/master'
Diffstat (limited to 'board/fads/pcmcia.c')
| -rw-r--r-- | board/fads/pcmcia.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/fads/pcmcia.c b/board/fads/pcmcia.c index 57a24543a8..99fe0b4fb9 100644 --- a/board/fads/pcmcia.c +++ b/board/fads/pcmcia.c @@ -62,7 +62,7 @@ int pcmcia_voltage_set(int slot, int vcc, int vpp) *((uint *)BCSR1) |= reg; #endif - *((uint *)BCSR1) |= reg << 20; + *((uint *)BCSR1) |= reg << 20; return 0; } |
