]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
toshiba_acpi: Add dependency on SERIO_I8042
authorSeth Forshee <seth.forshee@canonical.com>
Wed, 3 Jul 2013 13:14:16 +0000 (08:14 -0500)
committerMatthew Garrett <matthew.garrett@nebula.com>
Wed, 10 Jul 2013 19:42:50 +0000 (15:42 -0400)
Configuring this option as a module with ACPI_TOSHIBA built-in
results in the following errors:

   drivers/built-in.o: In function `toshiba_acpi_remove':
>> toshiba_acpi.c:(.text+0x314bb0): undefined reference to `i8042_remove_filter'
   drivers/built-in.o: In function `toshiba_acpi_add':
>> toshiba_acpi.c:(.devinit.text+0xb822): undefined reference to `i8042_install_filter'
>> toshiba_acpi.c:(.devinit.text+0xb98b): undefined reference to `i8042_remove_filter'

Add a dependency to prevent ACPI_TOSHIBA from being built-in when
SERIO_I8042=m.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: Azael Avalos <coproscefalo@gmail.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
drivers/platform/x86/Kconfig

index a3d76c59a3940a11e8a17ef0dbed35d078dd3e66..36a9e602339595de854f561ef725bd3bc3cd8bfa 100644 (file)
@@ -592,6 +592,7 @@ config ACPI_TOSHIBA
        depends on BACKLIGHT_CLASS_DEVICE
        depends on INPUT
        depends on RFKILL || RFKILL = n
+       depends on SERIO_I8042 || SERIO_I8042 = n
        select INPUT_POLLDEV
        select INPUT_SPARSEKMAP
        ---help---