[kernel/f13/master] make f13 lirc userspace happy with ioctl defs again (#623770)

[Jarod Wilson]

commit 7371a35ab090635138a848f9980d26c1cbded185
Author: Jarod Wilson <jarod at redhat.com>
Date:   Wed Aug 18 17:51:44 2010 -0400

    make f13 lirc userspace happy with ioctl defs again (#623770)
    
    Signed-off-by: Jarod Wilson <jarod at redhat.com>

 kernel.spec       |    5 ++++-
 lirc-2.6.33.patch |   36 ++++++++++++++++++------------------
 2 files changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 6efb938..3403ec2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -48,7 +48,7 @@ Summary: The Linux kernel
 # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
 # scripts/rebase.sh should be made to do that for you, actually.
 #
-%global baserelease 41
+%global baserelease 42
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2053,6 +2053,9 @@ fi
 
 
 %changelog
+* Wed Aug 18 2010 Jarod Wilson <jarod at redhat.com>
+- make f13 lirc userspace happy with ioctl defs again (#623770)
+
 * Wed Aug 18 2010 Dave Jones <davej at redhat.com>
 - ata-piix: Detect spurious IRQs and clear them.
 
diff --git a/lirc-2.6.33.patch b/lirc-2.6.33.patch
index 0aab0c7..aa6d4b6 100644
--- a/lirc-2.6.33.patch
+++ b/lirc-2.6.33.patch
@@ -93,27 +93,27 @@ index 0000000..8ae64fa
 +
 +/*** IOCTL commands for lirc driver ***/
 +
-+#define LIRC_GET_FEATURES              _IOR('i', 0x00000000, uint64_t)
++#define LIRC_GET_FEATURES              _IOR('i', 0x00000000, unsigned long)
 +
-+#define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, uint64_t)
-+#define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, uint64_t)
-+#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, uint32_t)
-+#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, uint32_t)
-+#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, uint32_t)
-+#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, uint32_t)
-+#define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, uint32_t)
++#define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, unsigned long)
++#define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, unsigned long)
++#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, unsigned int)
++#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, unsigned int)
++#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, unsigned int)
++#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, unsigned int)
++#define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, unsigned int)
 +
 +/* code length in bits, currently only for LIRC_MODE_LIRCCODE */
-+#define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, uint64_t)
++#define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, unsigned long)
 +
-+#define LIRC_SET_SEND_MODE             _IOW('i', 0x00000011, uint64_t)
-+#define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, uint64_t)
++#define LIRC_SET_SEND_MODE             _IOW('i', 0x00000011, unsigned long)
++#define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, unsigned long)
 +/* Note: these can reset the according pulse_width */
-+#define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, uint32_t)
-+#define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, uint32_t)
-+#define LIRC_SET_SEND_DUTY_CYCLE       _IOW('i', 0x00000015, uint32_t)
-+#define LIRC_SET_REC_DUTY_CYCLE        _IOW('i', 0x00000016, uint32_t)
-+#define LIRC_SET_TRANSMITTER_MASK      _IOW('i', 0x00000017, uint32_t)
++#define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, unsigned int)
++#define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, unsigned int)
++#define LIRC_SET_SEND_DUTY_CYCLE       _IOW('i', 0x00000015, unsigned int)
++#define LIRC_SET_REC_DUTY_CYCLE        _IOW('i', 0x00000016, unsigned int)
++#define LIRC_SET_TRANSMITTER_MASK      _IOW('i', 0x00000017, unsigned int)
 +
 +/*
 + * to set a range use
@@ -122,8 +122,8 @@ index 0000000..8ae64fa
 + * LIRC_SET_REC_DUTY_CYCLE/LIRC_SET_REC_CARRIER with the upper bound
 + */
 +
-+#define LIRC_SET_REC_DUTY_CYCLE_RANGE  _IOW('i', 0x0000001e, uint32_t)
-+#define LIRC_SET_REC_CARRIER_RANGE     _IOW('i', 0x0000001f, uint32_t)
++#define LIRC_SET_REC_DUTY_CYCLE_RANGE  _IOW('i', 0x0000001e, unsigned int)
++#define LIRC_SET_REC_CARRIER_RANGE     _IOW('i', 0x0000001f, unsigned int)
 +
 +#define LIRC_NOTIFY_DECODE             _IO('i', 0x00000020)
 +