diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 08:10:44 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-01-23 08:10:44 -0800 |
| commit | 55df811f2066fcaec2548248f0a1a6a0c12dc6b8 (patch) | |
| tree | 0850f490489e5b941692f3fe36dff5d2c1c35c3c /arch/ia64/Kconfig | |
| parent | 8e2f2325b73f3e5e46ecffd291556f33b8e3f8c9 (diff) | |
| parent | 497ab1f290a26fa9414c5c316515f1e2ddba0803 (diff) | |
Merge branch 'next' into for-linus
First round of input updates for 3.14.
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 4e4119b0e691..f7337aab201a 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -7,6 +7,7 @@ menu "Processor type and features" config IA64 bool select ARCH_MIGHT_HAVE_PC_PARPORT + select ARCH_MIGHT_HAVE_PC_SERIO select PCI if (!IA64_HP_SIM) select ACPI if (!IA64_HP_SIM) select PM if (!IA64_HP_SIM) |