diff options
| author | Stephen Rothwell <sfr@elm.ozlabs.ibm.com> | 2008-09-12 05:44:18 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@elm.ozlabs.ibm.com> | 2008-09-12 05:44:18 +1000 |
| commit | ead1241e61abb84adcd13d0828e6c91c33ed0d66 (patch) | |
| tree | 054f01fd9a2c880b3899c36e4eef7ea4dea8b484 /arch/arm/plat-omap/usb.c | |
| parent | 69169505f0c8226f728e67faf4566114994aea6d (diff) | |
| parent | b584cb9ef50a0138b3c15b2aa6a5d8b21258ccd2 (diff) | |
Merge commit 'arm/devel'
Diffstat (limited to 'arch/arm/plat-omap/usb.c')
| -rw-r--r-- | arch/arm/plat-omap/usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c index 777485e0636b..67ca1e216df7 100644 --- a/arch/arm/plat-omap/usb.c +++ b/arch/arm/plat-omap/usb.c @@ -27,8 +27,8 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/usb/otg.h> +#include <linux/io.h> -#include <asm/io.h> #include <asm/irq.h> #include <asm/system.h> #include <mach/hardware.h> |