diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-27 07:39:43 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 07:39:43 -0500 |
| commit | 31bccbf39208133415000520c79ebe7b291786df (patch) | |
| tree | e03b799594ec22613ca2eb7382fc0a98e0cd4b0f /drivers/input | |
| parent | e902be56cbf2a48d96d11d6884767e638d41c712 (diff) | |
| parent | 635f0258e5ae526034486b4ae9020e64bfb7d27e (diff) | |
Merge branch 'clps7500' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/serio/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index 27d70d326ff3..da3c3a5d2689 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig | |||
| @@ -79,7 +79,7 @@ config SERIO_PARKBD | |||
| 79 | 79 | ||
| 80 | config SERIO_RPCKBD | 80 | config SERIO_RPCKBD |
| 81 | tristate "Acorn RiscPC keyboard controller" | 81 | tristate "Acorn RiscPC keyboard controller" |
| 82 | depends on ARCH_ACORN || ARCH_CLPS7500 | 82 | depends on ARCH_ACORN |
| 83 | default y | 83 | default y |
| 84 | help | 84 | help |
| 85 | Say Y here if you have the Acorn RiscPC and want to use an AT | 85 | Say Y here if you have the Acorn RiscPC and want to use an AT |