diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-09 17:20:13 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-09 17:20:13 +0100 |
| commit | d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de (patch) | |
| tree | 1e8c402df9b1154f4ca37eb5242f960ef7aab747 /drivers/usb/musb/davinci.c | |
| parent | 2ebfb8eeb8f244f9d25937d31a947895cf819e26 (diff) | |
| parent | 8bd4bb7a35e8ebb015a531218614c48e10a3c4ee (diff) | |
| download | kernel-crypto-d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de.tar.gz kernel-crypto-d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de.tar.xz kernel-crypto-d9f8e9c34150ebec2be07bb95b6a23d99ba1f6de.zip | |
Merge branch 'topic/quirk-cleanup' into topic/misc
Diffstat (limited to 'drivers/usb/musb/davinci.c')
| -rw-r--r-- | drivers/usb/musb/davinci.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index 0d566dc5ce0..5a8fd5d57a1 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c @@ -32,9 +32,10 @@ #include <linux/io.h> #include <linux/gpio.h> -#include <mach/arch/hardware.h> -#include <mach/arch/memory.h> -#include <mach/arch/gpio.h> +#include <mach/hardware.h> +#include <mach/memory.h> +#include <mach/gpio.h> + #include <asm/mach-types.h> #include "musb_core.h" @@ -370,12 +371,6 @@ int musb_platform_set_mode(struct musb *musb, u8 mode) return -EIO; } -int musb_platform_set_mode(struct musb *musb, u8 mode) -{ - /* EVM can't do this (right?) */ - return -EIO; -} - int __init musb_platform_init(struct musb *musb) { void __iomem *tibase = musb->ctrl_base; |