diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-09 13:03:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-09 13:03:13 -0400 |
| commit | 492c71dd545a54dc62df8780bd8d233d771748df (patch) | |
| tree | 73960c90dd47938000478b9b3b1228a8c860e65b /drivers/usb | |
| parent | f0af7245f1725fdc39b32b59c20500448437ddbe (diff) | |
| parent | 18365d181fe7fee8b52cd12482200d3a4c48d05e (diff) | |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/ehci-orion.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c index 5fbdc14e63b3..5416cf969005 100644 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/host/ehci-orion.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/mbus.h> | 14 | #include <linux/mbus.h> |
| 15 | #include <asm/plat-orion/ehci-orion.h> | 15 | #include <plat/ehci-orion.h> |
| 16 | 16 | ||
| 17 | #define rdl(off) __raw_readl(hcd->regs + (off)) | 17 | #define rdl(off) __raw_readl(hcd->regs + (off)) |
| 18 | #define wrl(off, val) __raw_writel((val), hcd->regs + (off)) | 18 | #define wrl(off, val) __raw_writel((val), hcd->regs + (off)) |