projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'u-boot-at91/for-1.3.4'
[oweals/u-boot.git]
/
drivers
/
usb
/
isp116x-hcd.c
diff --git
a/drivers/usb/isp116x-hcd.c
b/drivers/usb/isp116x-hcd.c
index b21af10d0ba090ef504911befa970ec96133b4d4..6b9b23bc6ed9c3889bc21a961693d42ed7e11562 100644
(file)
--- a/
drivers/usb/isp116x-hcd.c
+++ b/
drivers/usb/isp116x-hcd.c
@@
-20,7
+20,7
@@
* MA 02111-1307 USA
*
*
* MA 02111-1307 USA
*
*
- * Derived in part from the SL811 HCD driver "u-boot/drivers/sl811_usb.c"
+ * Derived in part from the SL811 HCD driver "u-boot/drivers/
usb/
sl811_usb.c"
* (original copyright message follows):
*
* (C) Copyright 2004
* (original copyright message follows):
*
* (C) Copyright 2004
@@
-135,7
+135,7
@@
static int isp116x_reset(struct isp116x *isp116x);
r, isp116x_read_reg32(d, r)); \
} else { \
DBG("%-12s[%02x]: %04x", #r, \
r, isp116x_read_reg32(d, r)); \
} else { \
DBG("%-12s[%02x]: %04x", #r, \
- r, isp116x_read_reg16(d, r)); \
+ r, isp116x_read_reg16(d, r)); \
} \
}
} \
}