Commit 0f974aa1 authored by Tony Lindgren's avatar Tony Lindgren

ARM: OMAP: Move STI support to drivers/misc

This is to allow syncing plat-omap with mainline kernel.
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a3fe1e9c
......@@ -113,17 +113,6 @@ config OMAP_MUX_WARNINGS
to change the pin multiplexing setup. When there are no warnings
printed, it's safe to deselect OMAP_MUX for your product.
config OMAP_STI
bool "STI/XTI support"
depends on ARCH_OMAP16XX || ARCH_OMAP24XX
default n
config OMAP_STI_CONSOLE
bool "STI console support"
depends on OMAP_STI
help
This enables a console driver by way of STI/XTI.
config OMAP_MCBSP
bool "McBSP support"
depends on ARCH_OMAP
......
......@@ -14,9 +14,6 @@ obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o
obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
# STI support
obj-$(CONFIG_OMAP_STI) += sti/
obj-$(CONFIG_CPU_FREQ) += cpu-omap.o
obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
obj-$(CONFIG_OMAP_BOOT_REASON) += bootreason.o
......
......@@ -317,6 +317,17 @@ config INTEL_MENLOW
If unsure, say N.
config OMAP_STI
bool "STI/XTI support"
depends on ARCH_OMAP16XX || ARCH_OMAP24XX
default n
config OMAP_STI_CONSOLE
bool "STI console support"
depends on OMAP_STI
help
This enables a console driver by way of STI/XTI.
config ENCLOSURE_SERVICES
tristate "Enclosure Services"
default n
......
......@@ -5,6 +5,7 @@ obj- := misc.o # Dummy rule to force built-in.o to be made
obj-$(CONFIG_IBM_ASM) += ibmasm/
obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/
obj-$(CONFIG_OMAP_STI) += sti/
obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o
obj-$(CONFIG_ACER_WMI) += acer-wmi.o
obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment