Kumar Gala 68e1ee62f0 powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks ... Now that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all powerpc platforms and we want to get rid of CONFIG_PPC_MERGE use CONFIG_PPC instead. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>		2008-09-23 10:41:28 -05:00
..
gameport	Input: remove CVS keywords	2008-05-20 12:17:39 -04:00
joystick	Input: xpad - add Pelican Eclipse D-Pad to the list of devices	2008-07-31 00:45:59 -04:00
keyboard	Blackfin arch: move include/asm-blackfin header files to arch/blackfin	2008-08-27 10:51:02 +08:00
misc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2008-08-19 13:34:33 -07:00
mouse	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2008-09-06 21:47:30 -07:00
serio	powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks	2008-09-23 10:41:28 -05:00
tablet	Input: remove version.h from drivers that don't need it	2008-08-18 11:00:47 -04:00
touchscreen	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
Kconfig	xen pvfb: Para-virtual framebuffer, keyboard and pointer driver	2008-04-24 23:57:33 +02:00
Makefile	xen pvfb: Para-virtual framebuffer, keyboard and pointer driver	2008-04-24 23:57:33 +02:00
apm-power.c	Input: apm-power - fix crash when unloading modules	2008-03-24 11:02:06 -04:00
evbug.c	Input: evbug - identify device by its sysfs ID	2008-06-30 09:36:17 -04:00
evdev.c	Input: evdev - fix printf() format for sizeof	2008-08-19 11:35:27 -04:00
ff-core.c	drivers/input/ff-core.c needs <linux/sched.h>	2008-07-02 18:40:08 -07:00
ff-memless.c	Input: use clamp_val() macro in ff-memless.c	2008-05-16 14:49:47 -04:00
fixp-arith.h	changed email	2007-10-20 00:47:32 +02:00
input-polldev.c	Input: remove private member from input_dev structure	2008-04-02 00:41:00 -04:00
input.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next	2008-07-21 00:55:14 -04:00
joydev.c	Input: make sure input interfaces pin parent input devices	2008-04-01 00:22:53 -04:00
mousedev.c	mousedev: BKL pushdown	2008-07-02 15:06:23 -06:00
xen-kbdfront.c	xen pvfb: Dynamic mode support (screen resizing)	2008-05-27 10:11:36 +02:00