diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 18:40:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 18:40:39 -0500 |
| commit | ea14fad0d416354a4e9bb1a04f32acba706f9548 (patch) | |
| tree | 2c8acc5331f189aef1d40ddce3f40d6be9314e77 /drivers/usb/host/ohci-hcd.c | |
| parent | 6ee7e78e7c78d871409ad4df30551c9355be7d0e (diff) | |
| parent | 6705cda24fad1cb0ac82ac4f312df8ec735b39b0 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (76 commits)
[ARM] 4002/1: S3C24XX: leave parent IRQs unmasked
[ARM] 4001/1: S3C24XX: shorten reboot time
[ARM] 3983/2: remove unused argument to __bug()
[ARM] 4000/1: Osiris: add third serial port in
[ARM] 3999/1: RX3715: suspend to RAM support
[ARM] 3998/1: VR1000: LED platform devices
[ARM] 3995/1: iop13xx: add iop13xx support
[ARM] 3968/1: iop13xx: add iop13xx_defconfig
[ARM] Update mach-types
[ARM] Allow gcc to optimise arm_add_memory a little more
[ARM] 3991/1: i.MX/MX1 high resolution time source
[ARM] 3990/1: i.MX/MX1 more precise PLL decode
[ARM] 3986/1: H1940: suspend to RAM support
[ARM] 3985/1: ixp4xx clocksource cleanup
[ARM] 3984/1: ixp4xx/nslu2: Fix disk LED numbering (take 2)
[ARM] 3994/1: ixp23xx: fix handling of pci master aborts
[ARM] 3981/1: sched_clock for PXA2xx
[ARM] 3980/1: extend the ARM Versatile sched_clock implementation from 32 to 63 bit
[ARM] 3979/1: extend the SA11x0 sched_clock implementation from 32 to 63 bit period
[ARM] 3978/1: macro to provide a 63-bit value from a 32-bit hardware counter
...
Diffstat (limited to 'drivers/usb/host/ohci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ohci-hcd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index a95275a401b1..b28a9b602066 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
| @@ -945,7 +945,7 @@ MODULE_LICENSE ("GPL"); | |||
| 945 | #include "ohci-ppc-soc.c" | 945 | #include "ohci-ppc-soc.c" |
| 946 | #endif | 946 | #endif |
| 947 | 947 | ||
| 948 | #if defined(CONFIG_ARCH_AT91RM9200) || defined(CONFIG_ARCH_AT91SAM9261) | 948 | #ifdef CONFIG_ARCH_AT91 |
| 949 | #include "ohci-at91.c" | 949 | #include "ohci-at91.c" |
| 950 | #endif | 950 | #endif |
| 951 | 951 | ||
| @@ -962,8 +962,7 @@ MODULE_LICENSE ("GPL"); | |||
| 962 | || defined (CONFIG_ARCH_EP93XX) \ | 962 | || defined (CONFIG_ARCH_EP93XX) \ |
| 963 | || defined (CONFIG_SOC_AU1X00) \ | 963 | || defined (CONFIG_SOC_AU1X00) \ |
| 964 | || defined (CONFIG_USB_OHCI_HCD_PPC_SOC) \ | 964 | || defined (CONFIG_USB_OHCI_HCD_PPC_SOC) \ |
| 965 | || defined (CONFIG_ARCH_AT91RM9200) \ | 965 | || defined (CONFIG_ARCH_AT91) \ |
| 966 | || defined (CONFIG_ARCH_AT91SAM9261) \ | ||
| 967 | || defined (CONFIG_ARCH_PNX4008) \ | 966 | || defined (CONFIG_ARCH_PNX4008) \ |
| 968 | ) | 967 | ) |
| 969 | #error "missing bus glue for ohci-hcd" | 968 | #error "missing bus glue for ohci-hcd" |