diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-11 10:49:34 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-11 10:49:34 +0100 |
| commit | d95c3578120e5bc4784069439f00ccb1b5f87717 (patch) | |
| tree | c819de31de3983f3d69f223ede07667ff23bf7da /drivers/usb/musb/tusb6010_omap.c | |
| parent | ba1d755a36f66101aa88ac9ebb54694def6ec38d (diff) | |
| parent | 78b020d035074fc3aa4d017353bb2c32e2aff56f (diff) | |
| download | kernel_samsung_crespo-d95c3578120e5bc4784069439f00ccb1b5f87717.zip kernel_samsung_crespo-d95c3578120e5bc4784069439f00ccb1b5f87717.tar.gz kernel_samsung_crespo-d95c3578120e5bc4784069439f00ccb1b5f87717.tar.bz2 | |
Merge branch 'x86/core' into cpus4096
Diffstat (limited to 'drivers/usb/musb/tusb6010_omap.c')
| -rw-r--r-- | drivers/usb/musb/tusb6010_omap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c index 52f7f29..7e073a0 100644 --- a/drivers/usb/musb/tusb6010_omap.c +++ b/drivers/usb/musb/tusb6010_omap.c @@ -15,8 +15,8 @@ #include <linux/usb.h> #include <linux/platform_device.h> #include <linux/dma-mapping.h> -#include <asm/arch/dma.h> -#include <asm/arch/mux.h> +#include <mach/dma.h> +#include <mach/mux.h> #include "musb_core.h" |