Merge remote branch 'jwb/next' into next

[~andy/linux] / drivers / input / gameport / Makefile

diff --git a/drivers/input/gameport/Makefile b/drivers/input/gameport/Makefile
index 5367b4267adf8401fdc6840b1bb50e66b25b1dfd..b6f6097bd8c4f005cd031f2d7b9ddcccb94712b6 100644 (file)
--- a/drivers/input/gameport/Makefile
+++ b/drivers/input/gameport/Makefile
@@ -5,9 +5,7 @@
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_GAMEPORT)         += gameport.o
-obj-$(CONFIG_GAMEPORT_CS461X)  += cs461x.o
 obj-$(CONFIG_GAMEPORT_EMU10K1) += emu10k1-gp.o
 obj-$(CONFIG_GAMEPORT_FM801)   += fm801-gp.o
 obj-$(CONFIG_GAMEPORT_L4)      += lightning.o
 obj-$(CONFIG_GAMEPORT_NS558)   += ns558.o
-obj-$(CONFIG_GAMEPORT_VORTEX)  += vortex.o