diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-10-18 08:01:25 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-05 03:55:33 -0500 |
commit | 694e33a7f42de7dcc8b43c3990c597b19ef9b438 (patch) | |
tree | 02b6995f41eab4474fd8d9df419775825a13b362 /drivers/input/keyboard | |
parent | 865fab601b8f910b2c634cf4c9211176f2c71cad (diff) |
ARM: plat-nomadik: move MTU, kill plat-nomadik
This moves the MTU timer driver from arch/arm/plat-nomadik
to drivers/clocksource and moves the header file to the
platform_data directory.
As this moves the last file being compiled to an object out
of arch/arm/plat-nomadik, we have to "turn off the light"
and delete the plat-nomadik directory, because it is not
allowed to have an empty Makefile in a plat-* directory.
This is probably also a desired side effect of depopulating
the arch/arm directory of drivers. Luckily we have just
deleted all the <plat/*> include files prior to this so
by moving the last one we may delete the directory.
After this all the Ux500 and Nomadik device drivers live
outside of the arch/arm hierarchy.
Cc: Alessandro Rubini <rubini@unipv.it>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r-- | drivers/input/keyboard/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index b4b65af8612..855fc52945d 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig | |||
@@ -408,7 +408,7 @@ config KEYBOARD_NEWTON | |||
408 | 408 | ||
409 | config KEYBOARD_NOMADIK | 409 | config KEYBOARD_NOMADIK |
410 | tristate "ST-Ericsson Nomadik SKE keyboard" | 410 | tristate "ST-Ericsson Nomadik SKE keyboard" |
411 | depends on PLAT_NOMADIK | 411 | depends on (ARCH_NOMADIK || ARCH_U8500) |
412 | select INPUT_MATRIXKMAP | 412 | select INPUT_MATRIXKMAP |
413 | help | 413 | help |
414 | Say Y here if you want to use a keypad provided on the SKE controller | 414 | Say Y here if you want to use a keypad provided on the SKE controller |