diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-21 16:10:36 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-02-21 16:10:42 +1100 |
| commit | 846bb7788aced3ff6bfb5f674899ee5bc783e98e (patch) | |
| tree | a19c658572beb8963dabe962f626265845b5d6b2 /arch/tile/Kconfig | |
| parent | 8cc156311126614ff6a59560e4eb20731156f799 (diff) | |
| parent | da691fd2697453e910a4bd0c8daaa80da48a0935 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/tile/Kconfig')
| -rw-r--r-- | arch/tile/Kconfig | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig index 59763412e4dd..14044977b386 100644 --- a/arch/tile/Kconfig +++ b/arch/tile/Kconfig @@ -17,6 +17,7 @@ config TILE select GENERIC_IRQ_SHOW select HAVE_DEBUG_BUGVERBOSE select HAVE_SYSCALL_WRAPPERS if TILEGX + select HAVE_VIRT_TO_BUS select SYS_HYPERVISOR select ARCH_HAVE_NMI_SAFE_CMPXCHG select GENERIC_CLOCKEVENTS @@ -416,12 +417,6 @@ config TILE_USB Provides USB host adapter support for the built-in EHCI and OHCI interfaces on TILE-Gx chips. -# USB OHCI needs the bounce pool since tilegx will often have more -# than 4GB of memory, but we don't currently use the IOTLB to present -# a 32-bit address to OHCI. So we need to use a bounce pool instead. -config NEED_BOUNCE_POOL - def_bool USB_OHCI_HCD - source "drivers/pci/hotplug/Kconfig" endmenu |