Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 115b2ce1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

parents dd49f967 5fc4e6e1

drivers/input/input.c

+1 −1
Original line number Diff line number Diff line
@@ -477,8 +477,8 @@ static int __init input_proc_init(void) 


	entry->owner = THIS_MODULE;

	input_fileops = *entry->proc_fops;

	input_fileops.poll = input_devices_poll;

	entry->proc_fops = &input_fileops;

	entry->proc_fops->poll = input_devices_poll;



	entry = create_proc_read_entry("handlers", 0, proc_bus_input_dir, input_handlers_read, NULL);

	if (!entry)

drivers/input/joystick/grip_mp.c

+0 −9
Original line number Diff line number Diff line
@@ -53,17 +53,8 @@ struct grip_port { 
struct grip_mp {

	struct gameport *gameport;

	struct grip_port *port[GRIP_MAX_PORTS];

//	struct input_dev *dev[4];

//	int mode[4];

//	int registered[4];

	int reads;

	int bads;



	/* individual gamepad states */

//	int buttons[4];

//	int xaxes[4];

//	int yaxes[4];

//	int dirty[4];     /* has the state been updated? */

};



/*

drivers/input/keyboard/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -143,16 +143,6 @@ config KEYBOARD_SPITZ 
	  To compile this driver as a module, choose M here: the

	  module will be called spitzkbd.



config KEYBOARD_MAPLE

	tristate "Maple bus keyboard"

	depends on SH_DREAMCAST && MAPLE

	help

	  Say Y here if you have a DreamCast console running Linux and have

	  a keyboard attached to its Maple bus.



	  To compile this driver as a module, choose M here: the

	  module will be called maple_keyb.



config KEYBOARD_AMIGA

	tristate "Amiga keyboard"

	depends on AMIGA

drivers/input/keyboard/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
# Each configuration option enables a list of files.



obj-$(CONFIG_KEYBOARD_ATKBD)		+= atkbd.o

obj-$(CONFIG_KEYBOARD_MAPLE)		+= maple_keyb.o

obj-$(CONFIG_KEYBOARD_SUNKBD)		+= sunkbd.o

obj-$(CONFIG_KEYBOARD_LKKBD)		+= lkkbd.o

obj-$(CONFIG_KEYBOARD_XTKBD)		+= xtkbd.o

drivers/input/misc/wistron_btns.c

+3 −3
Original line number Diff line number Diff line
@@ -92,11 +92,11 @@ static void call_bios(struct regs *regs) 
	preempt_enable();

}



static size_t __init locate_wistron_bios(void __iomem *base)

static ssize_t __init locate_wistron_bios(void __iomem *base)

{

	static const unsigned char __initdata signature[] =

		{ 0x42, 0x21, 0x55, 0x30 };

	size_t offset;

	ssize_t offset;



	for (offset = 0; offset < 0x10000; offset += 0x10) {

		if (check_signature(base + offset, signature,
@@ -109,7 +109,7 @@ static size_t __init locate_wistron_bios(void __iomem *base) 
static int __init map_bios(void)

{

	void __iomem *base;

	size_t offset;

	ssize_t offset;

	u32 entry_point;



	base = ioremap(0xF0000, 0x10000); /* Can't fail */