rpms/kernel/devel linux-2.6-lirc.patch,1.12,1.13

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22163

Modified Files:
	linux-2.6-lirc.patch 
Log Message:
whoops, helps if things compile...

linux-2.6-lirc.patch:

Index: linux-2.6-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-lirc.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-lirc.patch	5 Sep 2008 04:25:29 -0000	1.12
+++ linux-2.6-lirc.patch	5 Sep 2008 04:34:05 -0000	1.13
@@ -1,9 +1,3 @@
-Linux Infrared Remote Control drivers
-
-Signed-off-by: Jarod Wilson <jarod at redhat.com>
-
----
-
  drivers/input/Kconfig                 |    2 +
  drivers/input/Makefile                |    2 +
  drivers/input/lirc/Kconfig            |  142 ++++
@@ -22,7 +16,7 @@
  drivers/input/lirc/lirc_imon.c        | 1280 ++++++++++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.c        | 1004 +++++++++++++++++++++++
  drivers/input/lirc/lirc_it87.h        |  116 +++
- drivers/input/lirc/lirc_ite8709.c     |  565 +++++++++++++
+ drivers/input/lirc/lirc_ite8709.c     |  561 +++++++++++++
  drivers/input/lirc/lirc_mceusb.c      |  884 +++++++++++++++++++++
  drivers/input/lirc/lirc_mceusb2.c     | 1117 ++++++++++++++++++++++++++
  drivers/input/lirc/lirc_parallel.c    |  732 +++++++++++++++++
@@ -33,7 +27,7 @@
  drivers/input/lirc/lirc_streamzap.c   |  795 +++++++++++++++++++
  drivers/input/lirc/lirc_ttusbir.c     |  394 ++++++++++
  drivers/input/lirc/lirc_zilog.c       | 1397 +++++++++++++++++++++++++++++++++
- 29 files changed, 17877 insertions(+), 0 deletions(-)
+ 29 files changed, 17873 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
 index 5f9d860..747633c 100644
@@ -5494,7 +5488,7 @@
 + */
 diff --git a/drivers/input/lirc/lirc_igorplugusb.c b/drivers/input/lirc/lirc_igorplugusb.c
 new file mode 100644
-index 0000000..b28706d
+index 0000000..6b3ac64
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_igorplugusb.c
 @@ -0,0 +1,611 @@
@@ -5601,7 +5595,7 @@
 +
 +/* times to poll per second */
 +#define SAMPLE_RATE	     100
-+static int sample_rate = SAMPLE_RATE
++static int sample_rate = SAMPLE_RATE;
 +
 +
 +/**** Igor's USB Request Codes */
@@ -6100,7 +6094,7 @@
 +MODULE_DEVICE_TABLE(usb, usb_remote_id_table);
 +
 +module_param(sample_rate, int, 0644);
-+MODULE_PARAM_DESC(sample_rate, "Sampling rate in Hz (default: 100)");
++MODULE_PARM_DESC(sample_rate, "Sampling rate in Hz (default: 100)");
 +
 +/*
 + * Overrides for Emacs so that we follow Linus's tabbing style.
@@ -8529,10 +8523,10 @@
 +/********************************* ITE IT87xx ************************/
 diff --git a/drivers/input/lirc/lirc_ite8709.c b/drivers/input/lirc/lirc_ite8709.c
 new file mode 100644
-index 0000000..a16e809
+index 0000000..60b28e9
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_ite8709.c
-@@ -0,0 +1,565 @@
+@@ -0,0 +1,561 @@
 +/*
 + * LIRC driver for ITE8709 CIR port
 + *
@@ -8562,17 +8556,17 @@
 +#endif
 +
 +#include <linux/autoconf.h>
++#include <linux/interrupt.h>
 +
 +#include <linux/pnp.h>
 +#include <linux/io.h>
 +
 +#include "lirc.h"
 +#include "lirc_dev.h"
-+#include "kcompat.h"
 +
 +#define LIRC_DRIVER_NAME "lirc_ite8709"
 +
-+#define BUF_CHUNK_SIZE	sizeof(lirc_t)
++#define BUF_CHUNK_SIZE	sizeof(int)
 +#define BUF_SIZE	(128*BUF_CHUNK_SIZE)
 +
 +/*******************************************************************************
@@ -8754,7 +8748,6 @@
 +static int ite8709_set_use_inc(void *data)
 +{
 +	struct ite8709_device *dev;
-+	MOD_INC_USE_COUNT;
 +	dev = data;
 +	if (dev->use_count == 0)
 +		ite8709_init_hardware(dev);
@@ -8765,7 +8758,6 @@
 +static void ite8709_set_use_dec(void *data)
 +{
 +	struct ite8709_device *dev;
-+	MOD_DEC_USE_COUNT;
 +	dev = data;
 +	dev->use_count--;
 +	if (dev->use_count == 0)
@@ -8775,7 +8767,7 @@
 +static void ite8709_add_read_queue(struct ite8709_device *dev, int flag,
 +					unsigned long long val)
 +{
-+	lirc_t value;
++	int value;
 +
 +	dprintk("add a %llu usec %s\n", val, flag ? "pulse" : "space");
 +
@@ -8973,7 +8965,7 @@
 +	plugin = &ite8709_dev->plugin;
 +	strcpy(plugin->name, LIRC_DRIVER_NAME);
 +	plugin->minor = -1;
-+	plugin->code_length = sizeof(lirc_t) * 8;
++	plugin->code_length = sizeof(int) * 8;
 +	plugin->sample_rate = 0;
 +	plugin->features = LIRC_CAN_REC_MODE2;
 +	plugin->data = ite8709_dev;
@@ -9089,8 +9081,6 @@
 +module_param(debug, bool, 0644);
 +MODULE_PARM_DESC(debug, "Enable debugging messages");
 +
-+EXPORT_NO_SYMBOLS;
-+
 +/*
 + * Overrides for Emacs so that we follow Linus's tabbing style.
 + * ---------------------------------------------------------------------------
@@ -9990,7 +9980,7 @@
 +MODULE_PARM_DESC(debug, "Debug enabled or not");
 diff --git a/drivers/input/lirc/lirc_mceusb2.c b/drivers/input/lirc/lirc_mceusb2.c
 new file mode 100644
-index 0000000..34d9bb2
+index 0000000..659d363
 --- /dev/null
 +++ b/drivers/input/lirc/lirc_mceusb2.c
 @@ -0,0 +1,1117 @@
@@ -10946,7 +10936,7 @@
 +	ir->usbdev = dev;
 +	ir->len_in = maxp;
 +	ir->flags.connected = 0;
-+	ir-flags.pinnacle = is_pinnacle;
++	ir->flags.pinnacle = is_pinnacle;
 +	ir->flags.transmitter_mask_inverted =
 +		usb_match_id(intf, transmitter_mask_list) ? 0 : 1;
 +