diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-06 10:51:06 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-06 10:51:06 -0500 |
| commit | 66267ee58732bb4c21c7bbba004ee481b8ad2b30 (patch) | |
| tree | bf7f72e623d7c1ca6472e0a1286e802cd3bff139 /drivers/usb/renesas_usbhs/pipe.h | |
| parent | 6ed68a6d83e4497dc33581ccc82b4fa3e7e8226d (diff) | |
| parent | f58007762f537ba13674a3138b3f4c20fff1cba9 (diff) | |
Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup
From Michal Simek:
* 'arm-next' of git://git.xilinx.com/linux-xlnx:
zynq: move static peripheral mappings
zynq: remove use of CLKDEV_LOOKUP
zynq: use pl310 device tree bindings
zynq: use GIC device tree bindings
+ Linux 3.7-rc3
Diffstat (limited to 'drivers/usb/renesas_usbhs/pipe.h')
| -rw-r--r-- | drivers/usb/renesas_usbhs/pipe.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/renesas_usbhs/pipe.h b/drivers/usb/renesas_usbhs/pipe.h index 08786c06dcf..3d80c7b1fd1 100644 --- a/drivers/usb/renesas_usbhs/pipe.h +++ b/drivers/usb/renesas_usbhs/pipe.h | |||
| @@ -54,7 +54,7 @@ struct usbhs_pipe_info { | |||
| 54 | * pipe list | 54 | * pipe list |
| 55 | */ | 55 | */ |
| 56 | #define __usbhs_for_each_pipe(start, pos, info, i) \ | 56 | #define __usbhs_for_each_pipe(start, pos, info, i) \ |
| 57 | for (i = start, pos = (info)->pipe; \ | 57 | for (i = start, pos = (info)->pipe + i; \ |
| 58 | i < (info)->size; \ | 58 | i < (info)->size; \ |
| 59 | i++, pos = (info)->pipe + i) | 59 | i++, pos = (info)->pipe + i) |
| 60 | 60 | ||