Skip to content

Commit 751ad34

Browse files
arndbdtor
authored andcommitted
Input: adi - work around module name confict
Making module name conflicts a fatal error breaks sparc64 allmodconfig: Error log: error: the following would cause module name conflict: drivers/char/adi.ko drivers/input/joystick/adi.ko Renaming one of the modules would solve the problem, but then cause other problems because neither of them is automatically loaded and changing the name is likely to break any setup that relies on manually loading it by name. As there is probably no sparc64 system with this kind of ancient joystick attached, work around it by adding a Kconfig dependency that forbids them from both being modules. It is still possible to build the joystick driver if the sparc64 adi driver is built-in. Reported-by: Guenter Roeck <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Reviewed-by: Guenter Roeck <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent 8dd06ef commit 751ad34

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/input/joystick/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ config JOYSTICK_A3D
4545
config JOYSTICK_ADI
4646
tristate "Logitech ADI digital joysticks and gamepads"
4747
select GAMEPORT
48+
depends on ADI!=m # avoid module name conflict
4849
help
4950
Say Y here if you have a Logitech controller using the ADI
5051
protocol over the PC gameport.

0 commit comments

Comments
 (0)