diff options
| author | Stefan Roese <sr@denx.de> | 2007-03-01 21:16:02 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-03-01 21:16:02 +0100 |
| commit | c8556d0e0b27c57c0860f55736761a18c7a115f2 (patch) | |
| tree | 4ab1cc720d191688c72fc4ebcfb49c384c0a0228 /drivers/systemace.c | |
| parent | ba58e4c9a9a917ce795dd16d4ec8d515f9f7aa35 (diff) | |
| parent | 8c12045a3b06c5b6675d3fe02fbc9f545988129a (diff) | |
Merge with /home/stefan/git/u-boot/denx-merge-sr
Diffstat (limited to 'drivers/systemace.c')
| -rw-r--r-- | drivers/systemace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/systemace.c b/drivers/systemace.c index 634aa9ba7d1..3848d9c59c2 100644 --- a/drivers/systemace.c +++ b/drivers/systemace.c @@ -56,12 +56,12 @@ #if (CFG_SYSTEMACE_WIDTH == 8) #if !defined(__BIG_ENDIAN) #define ace_readw(off) ((readb(CFG_SYSTEMACE_BASE+off)<<8) | \ - (readb(CFG_SYSTEMACE_BASE+off+1))) + (readb(CFG_SYSTEMACE_BASE+off+1))) #define ace_writew(val, off) {writeb(val>>8, CFG_SYSTEMACE_BASE+off); \ writeb(val, CFG_SYSTEMACE_BASE+off+1);} #else #define ace_readw(off) ((readb(CFG_SYSTEMACE_BASE+off)) | \ - (readb(CFG_SYSTEMACE_BASE+off+1)<<8)) + (readb(CFG_SYSTEMACE_BASE+off+1)<<8)) #define ace_writew(val, off) {writeb(val, CFG_SYSTEMACE_BASE+off); \ writeb(val>>8, CFG_SYSTEMACE_BASE+off+1);} #endif @@ -73,7 +73,7 @@ /* */ static unsigned long systemace_read(int dev, unsigned long start, - unsigned long blkcnt, void *buffer); + unsigned long blkcnt, void *buffer); static block_dev_desc_t systemace_dev = { 0 }; @@ -137,7 +137,7 @@ block_dev_desc_t *systemace_get_dev(int dev) * number of blocks read. A zero return indicates an error. */ static unsigned long systemace_read(int dev, unsigned long start, - unsigned long blkcnt, void *buffer) + unsigned long blkcnt, void *buffer) { int retry; unsigned blk_countdown; |