The patch titled
m68k/HP300: Enable HIL configuration options
has been added to the -mm tree. Its filename is
m68k-hp300-enable-hil-configuration-options.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: m68k/HP300: Enable HIL configuration options
From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Enable HIL configuration options on HP300
Signed-off-by: Kars de Jong <jongk@xxxxxxxxxxxxxx>
Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/input/keyboard/Kconfig | 4 ++--
drivers/input/misc/Kconfig | 2 +-
drivers/input/mouse/Kconfig | 2 +-
drivers/input/serio/Kconfig | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff -puN drivers/input/keyboard/Kconfig~m68k-hp300-enable-hil-configuration-options drivers/input/keyboard/Kconfig
--- a/drivers/input/keyboard/Kconfig~m68k-hp300-enable-hil-configuration-options
+++ a/drivers/input/keyboard/Kconfig
@@ -166,7 +166,7 @@ config KEYBOARD_AMIGA
config KEYBOARD_HIL_OLD
tristate "HP HIL keyboard support (simple driver)"
- depends on GSC
+ depends on GSC || HP300
default y
help
The "Human Interface Loop" is a older, 8-channel USB-like
@@ -183,7 +183,7 @@ config KEYBOARD_HIL_OLD
config KEYBOARD_HIL
tristate "HP HIL keyboard support"
- depends on GSC
+ depends on GSC || HP300
default y
select HP_SDC
select HIL_MLC
diff -puN drivers/input/misc/Kconfig~m68k-hp300-enable-hil-configuration-options drivers/input/misc/Kconfig
--- a/drivers/input/misc/Kconfig~m68k-hp300-enable-hil-configuration-options
+++ a/drivers/input/misc/Kconfig
@@ -73,7 +73,7 @@ config INPUT_UINPUT
config HP_SDC_RTC
tristate "HP SDC Real Time Clock"
- depends on GSC
+ depends on GSC || HP300
select HP_SDC
help
Say Y here if you want to support the built-in real time clock
diff -puN drivers/input/mouse/Kconfig~m68k-hp300-enable-hil-configuration-options drivers/input/mouse/Kconfig
--- a/drivers/input/mouse/Kconfig~m68k-hp300-enable-hil-configuration-options
+++ a/drivers/input/mouse/Kconfig
@@ -119,7 +119,7 @@ config MOUSE_VSXXXAA
config MOUSE_HIL
tristate "HIL pointers (mice etc)."
- depends on GSC
+ depends on GSC || HP300
select HP_SDC
select HIL_MLC
help
diff -puN drivers/input/serio/Kconfig~m68k-hp300-enable-hil-configuration-options drivers/input/serio/Kconfig
--- a/drivers/input/serio/Kconfig~m68k-hp300-enable-hil-configuration-options
+++ a/drivers/input/serio/Kconfig
@@ -112,7 +112,7 @@ config SERIO_GSCPS2
config HP_SDC
tristate "HP System Device Controller i8042 Support"
- depends on GSC && SERIO
+ depends on (GSC || HP300) && SERIO
default y
---help---
This option enables support for the "System Device
_
Patches currently in -mm which might be from geert@xxxxxxxxxxxxxx are
m68k-syscall-updates.patch
m68k-hp300-enable-hil-configuration-options.patch
m68k-atari-interrupt-updates.patch
m68k-apollo-remove-obsolete-arch-m68k-apollo-dmac.patch
m68k-mvme167-serial167-is-no-longer-broken.patch
m68k-mvme167-serial167-tty-flip-buffer-updates.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
