Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 36356
b: refs/heads/master
c: 60bbfc8
h: refs/heads/master
v: v3
  • Loading branch information
Vitaly Wool authored and Greg Kroah-Hartman committed Sep 27, 2006
1 parent 4989983 commit b7ef781
Show file tree
Hide file tree
Showing 5 changed files with 485 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b2a8e097d0f3bbb7ef550103022db92fc3832842
refs/heads/master: 60bbfc84b6d916f5a10127762d0dcb3f4726450d
1 change: 1 addition & 0 deletions trunk/drivers/usb/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ config USB_ARCH_HAS_OHCI
default y if PXA27x
default y if ARCH_EP93XX
default y if (ARCH_AT91RM9200 || ARCH_AT91SAM9261)
default y if ARCH_PNX4008
# PPC:
default y if STB03xxx
default y if PPC_MPC52xx
Expand Down
2 changes: 2 additions & 0 deletions trunk/drivers/usb/host/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ config USB_OHCI_HCD
tristate "OHCI HCD support"
depends on USB && USB_ARCH_HAS_OHCI
select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
select I2C if ARCH_PNX4008
select I2C_PNX if ARCH_PNX4008
---help---
The Open Host Controller Interface (OHCI) is a standard for accessing
USB 1.1 host controller hardware. It does more in hardware than Intel's
Expand Down
5 changes: 5 additions & 0 deletions trunk/drivers/usb/host/ohci-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -940,6 +940,10 @@ MODULE_LICENSE ("GPL");
#include "ohci-at91.c"
#endif

#ifdef CONFIG_ARCH_PNX4008
#include "ohci-pnx4008.c"
#endif

#if !(defined(CONFIG_PCI) \
|| defined(CONFIG_SA1111) \
|| defined(CONFIG_ARCH_S3C2410) \
Expand All @@ -951,6 +955,7 @@ MODULE_LICENSE ("GPL");
|| defined (CONFIG_USB_OHCI_HCD_PPC_SOC) \
|| defined (CONFIG_ARCH_AT91RM9200) \
|| defined (CONFIG_ARCH_AT91SAM9261) \
|| defined (CONFIG_ARCH_PNX4008) \
)
#error "missing bus glue for ohci-hcd"
#endif
Loading

0 comments on commit b7ef781

Please sign in to comment.