rpms/kernel/F-12 kernel.spec,1.2040,1.2041 lirc-2.6.32.patch,1.4,1.5

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29890

Modified Files:
	kernel.spec lirc-2.6.32.patch 
Log Message:
- Add two more variants of imon mce mode star and pound keys


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.2040
retrieving revision 1.2041
diff -u -p -r1.2040 -r1.2041
--- kernel.spec	16 Mar 2010 21:18:00 -0000	1.2040
+++ kernel.spec	16 Mar 2010 21:27:54 -0000	1.2041
@@ -2075,6 +2075,7 @@ fi
 %changelog
 * Tue Mar 16 2010 Jarod Wilson <jarod at redhat.com>
 - Catch imon panel/knob events from older 0xffdc devices
+- Add two more variants of imon mce mode star and pound keys
 
 * Tue Mar 16 2010 Chuck Ebbert <cebbert at redhat.com>
 - iwlwifi-silence-tfds-in-queue-message.patch:

lirc-2.6.32.patch:
 drivers/input/Kconfig                 |   30 
 drivers/input/Makefile                |    3 
 drivers/input/input-polldev.c         |   21 
 drivers/input/lirc/Kconfig            |  116 +
 drivers/input/lirc/Makefile           |   21 
 drivers/input/lirc/lirc_bt829.c       |  383 +++++
 drivers/input/lirc/lirc_dev.c         |  735 +++++++++
 drivers/input/lirc/lirc_dev.h         |  194 ++
 drivers/input/lirc/lirc_ene0100.c     |  646 ++++++++
 drivers/input/lirc/lirc_ene0100.h     |  169 ++
 drivers/input/lirc/lirc_i2c.c         |  536 +++++++
 drivers/input/lirc/lirc_igorplugusb.c |  555 +++++++
 drivers/input/lirc/lirc_imon.c        | 1053 ++++++++++++++
 drivers/input/lirc/lirc_it87.c        | 1019 +++++++++++++
 drivers/input/lirc/lirc_it87.h        |  116 +
 drivers/input/lirc/lirc_ite8709.c     |  540 +++++++
 drivers/input/lirc/lirc_mceusb.c      | 1225 ++++++++++++++++
 drivers/input/lirc/lirc_parallel.c    |  709 +++++++++
 drivers/input/lirc/lirc_parallel.h    |   26 
 drivers/input/lirc/lirc_sasem.c       |  931 ++++++++++++
 drivers/input/lirc/lirc_serial.c      | 1317 +++++++++++++++++
 drivers/input/lirc/lirc_sir.c         | 1283 +++++++++++++++++
 drivers/input/lirc/lirc_streamzap.c   |  794 ++++++++++
 drivers/input/lirc/lirc_ttusbir.c     |  397 +++++
 drivers/input/lirc/lirc_zilog.c       | 1388 ++++++++++++++++++
 drivers/input/misc/Kconfig            |   11 
 drivers/input/misc/Makefile           |    1 
 drivers/input/misc/imon.c             | 2501 ++++++++++++++++++++++++++++++++++
 drivers/input/sparse-keymap.c         |  250 +++
 include/linux/input/sparse-keymap.h   |   62 
 include/linux/lirc.h                  |   94 +
 31 files changed, 17113 insertions(+), 13 deletions(-)

Index: lirc-2.6.32.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/lirc-2.6.32.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- lirc-2.6.32.patch	16 Mar 2010 21:18:01 -0000	1.4
+++ lirc-2.6.32.patch	16 Mar 2010 21:27:54 -0000	1.5
@@ -25,11 +25,11 @@
  drivers/input/lirc/lirc_zilog.c       | 1388 ++++++++++++++++++
  drivers/input/misc/Kconfig            |   11 +
  drivers/input/misc/Makefile           |    1 +
- drivers/input/misc/imon.c             | 2499 +++++++++++++++++++++++++++++++++
+ drivers/input/misc/imon.c             | 2501 +++++++++++++++++++++++++++++++++
  drivers/input/sparse-keymap.c         |  250 ++++
  include/linux/input/sparse-keymap.h   |   62 +
  include/linux/lirc.h                  |   94 ++
- 31 files changed, 17111 insertions(+), 13 deletions(-)
+ 31 files changed, 17113 insertions(+), 13 deletions(-)
 
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index cd50c00..198e48f 100644
@@ -14520,10 +14520,10 @@ index a8b8485..79358ff 100644
  obj-$(CONFIG_INPUT_M68K_BEEP)		+= m68kspkr.o
 diff --git a/drivers/input/misc/imon.c b/drivers/input/misc/imon.c
 new file mode 100644
-index 0000000..0d1954d
+index 0000000..b5807cf
 --- /dev/null
 +++ b/drivers/input/misc/imon.c
-@@ -0,0 +1,2499 @@
+@@ -0,0 +1,2501 @@
 +/*
 + *   imon.c:	input and display driver for SoundGraph iMON IR/VFD/LCD
 + *
@@ -14883,8 +14883,10 @@ index 0000000..0d1954d
 +
 +	{ KE_KEY, 0x02200025, { KEY_NUMERIC_STAR } },
 +	{ KE_KEY, 0x28b515b7, { KEY_NUMERIC_STAR } },
++	{ KE_KEY, 0x800f841d, { KEY_NUMERIC_STAR } },
 +	{ KE_KEY, 0x02200020, { KEY_NUMERIC_POUND } },
 +	{ KE_KEY, 0x29a115b7, { KEY_NUMERIC_POUND } },
++	{ KE_KEY, 0x800f841c, { KEY_NUMERIC_POUND } },
 +
 +	{ KE_KEY, 0x2b8515b7, { KEY_VIDEO } },
 +	{ KE_KEY, 0x299195b7, { KEY_AUDIO } },