diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-08 15:50:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-08 15:50:19 -0700 |
| commit | 4ced08b89f591521c3d2e3e87ab914016e6b7d94 (patch) | |
| tree | ba5850b531db27d4fb8960b17bf7ddce0f5749d7 /drivers | |
| parent | e1d7bf14999469b16e86889ac71c94a9d0d2f5f4 (diff) | |
| parent | 1ad77a876da48331451698cc4172c90ab9b6372f (diff) | |
| download | op-kernel-dev-4ced08b89f591521c3d2e3e87ab914016e6b7d94.zip op-kernel-dev-4ced08b89f591521c3d2e3e87ab914016e6b7d94.tar.gz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5241/1: provide ioremap_wc()
[ARM] omap: fix virtual vs physical address space confusions
[ARM] remove unused #include <version.h>
[ARM] omap: fix build error in ohci-omap.c
[ARM] omap: fix gpio.c build error
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/ohci-omap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 1eb64d0..95b3ec8 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c @@ -208,7 +208,7 @@ static int ohci_omap_init(struct usb_hcd *hcd) if (cpu_is_omap16xx()) ocpi_enable(); -#ifdef CONFIG_ARCH_OMAP_OTG +#ifdef CONFIG_USB_OTG if (need_transceiver) { ohci->transceiver = otg_get_transceiver(); if (ohci->transceiver) { |
