Commit 96d6d72d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: evdev - fix printf() format for sizeof
  Input: remove version.h from drivers that don't need it
  Input: cobalt_btns - add missing MODULE_LICENSE
parents 4309e092 c85e2031

drivers/input/evdev.c

+2 −2
Original line number Diff line number Diff line
@@ -677,8 +677,8 @@ static int handle_eviocgbit(struct input_dev *dev, unsigned int cmd, void __user 
		len = OLD_KEY_MAX;

		if (printk_timed_ratelimit(&keymax_warn_time, 10 * 1000))

			printk(KERN_WARNING

				"evdev.c(EVIOCGBIT): Suspicious buffer size %d, "

				"limiting output to %d bytes. See "

				"evdev.c(EVIOCGBIT): Suspicious buffer size %u, "

				"limiting output to %zu bytes. See "

				"http://userweb.kernel.org/~dtor/eviocgbit-bug.html\n",

				OLD_KEY_MAX,

				BITS_TO_LONGS(OLD_KEY_MAX) * sizeof(long));

drivers/input/keyboard/gpio_keys.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 */



#include <linux/module.h>

#include <linux/version.h>



#include <linux/init.h>

#include <linux/fs.h>

drivers/input/misc/cobalt_btns.c

+3 −0
Original line number Diff line number Diff line
@@ -148,6 +148,9 @@ static int __devexit cobalt_buttons_remove(struct platform_device *pdev) 
	return 0;

}



MODULE_AUTHOR("Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>");

MODULE_DESCRIPTION("Cobalt button interface driver");

MODULE_LICENSE("GPL");

/* work with hotplug and coldplug */

MODULE_ALIAS("platform:Cobalt buttons");

drivers/input/mouse/gpio_mouse.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 */



#include <linux/init.h>

#include <linux/version.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/input-polldev.h>

drivers/input/tablet/gtco.c

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ Scott Hill shill@gtcocalcomp.com 
#include <asm/byteorder.h>





#include <linux/version.h>

#include <linux/usb/input.h>



/* Version with a Major number of 2 is for kernel inclusion only. */