Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[powerpc.git] / drivers / input / keyboard / locomokbd.c

diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
index a6ddd94..83906f8 100644 (file)
--- a/drivers/input/keyboard/locomokbd.c
+++ b/drivers/input/keyboard/locomokbd.c
@@ -25,7 +25,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -230,7 +229,7 @@ static int locomokbd_probe(struct locomo_dev *dev)
 
        input_dev->name = "LoCoMo keyboard";
        input_dev->phys = locomokbd->phys;
-       input_dev->id.bustype = BUS_XTKBD;
+       input_dev->id.bustype = BUS_HOST;
        input_dev->id.vendor = 0x0001;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;