Skip to content

Commit a0769f2

Browse files
arndbdianders
authored andcommitted
HID: i2c-hid: add more DRM dependencies
When a symbol is selected that has extra dependencies, anything that selects it must have the same dependencies. With the added CONFIG_DRM reference from I2C_HID_CORE, this broke a couple of drivers that now also depend on DRM: WARNING: unmet direct dependencies detected for I2C_HID_CORE Depends on [m]: HID_SUPPORT [=y] && I2C_HID [=y] && (DRM [=m] || !DRM [=m]) Selected by [y]: - I2C_HID_OF [=y] && HID_SUPPORT [=y] && I2C_HID [=y] - I2C_HID_ACPI [=y] && HID_SUPPORT [=y] && I2C_HID [=y] && ACPI [=y] - I2C_HID_OF_GOODIX [=y] && HID_SUPPORT [=y] && I2C_HID [=y] && OF [=y] x86_64-linux-ld: vmlinux.o: in function `i2c_hid_core_remove': (.text+0xfc8826): undefined reference to `drm_panel_remove_follower' x86_64-linux-ld: vmlinux.o: in function `i2c_hid_core_probe': (.text+0xfc8da0): undefined reference to `drm_is_panel_follower' Add the corresponding DRM||!DRM dependencies on each one that is affected. Fixes: 96a37bf ("HID: i2c-hid: Support being a panel follower") Signed-off-by: Arnd Bergmann <[email protected]> Reviewed-by: Douglas Anderson <[email protected]> Signed-off-by: Douglas Anderson <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 513bf56 commit a0769f2

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/hid/i2c-hid/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ if I2C_HID
99
config I2C_HID_ACPI
1010
tristate "HID over I2C transport layer ACPI driver"
1111
depends on ACPI
12+
depends on DRM || !DRM
1213
select I2C_HID_CORE
1314
help
1415
Say Y here if you use a keyboard, a touchpad, a touchscreen, or any
@@ -25,6 +26,7 @@ config I2C_HID_OF
2526
tristate "HID over I2C transport layer Open Firmware driver"
2627
# No "depends on OF" because this can also be used for manually
2728
# (board-file) instantiated "hid-over-i2c" type i2c-clients.
29+
depends on DRM || !DRM
2830
select I2C_HID_CORE
2931
help
3032
Say Y here if you use a keyboard, a touchpad, a touchscreen, or any
@@ -41,6 +43,7 @@ config I2C_HID_OF
4143
config I2C_HID_OF_ELAN
4244
tristate "Driver for Elan hid-i2c based devices on OF systems"
4345
depends on OF
46+
depends on DRM || !DRM
4447
select I2C_HID_CORE
4548
help
4649
Say Y here if you want support for Elan i2c devices that use
@@ -56,6 +59,7 @@ config I2C_HID_OF_ELAN
5659
config I2C_HID_OF_GOODIX
5760
tristate "Driver for Goodix hid-i2c based devices on OF systems"
5861
depends on OF
62+
depends on DRM || !DRM
5963
select I2C_HID_CORE
6064
help
6165
Say Y here if you want support for Goodix i2c devices that use

0 commit comments

Comments
 (0)