media: lirc: remove last remnants of lirc kapi

[linux-2.6-block.git] / include / media / rc-core.h

diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index 4f585bff1347baf6e7d7df7735292580edaec2a6..2d24c88652aad303afbdf595293a63e070bf809a 100644 (file)
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -17,10 +17,10 @@
 #define _RC_CORE
 
 #include <linux/spinlock.h>
+#include <linux/cdev.h>
 #include <linux/kfifo.h>
 #include <linux/time.h>
 #include <linux/timer.h>
-#include <media/lirc_dev.h>
 #include <media/rc-map.h>
 
 extern int rc_core_debug;
@@ -116,7 +116,8 @@ enum rc_filter_type {
  * @max_timeout: maximum timeout supported by device
  * @rx_resolution : resolution (in ns) of input sampler
  * @tx_resolution: resolution (in ns) of output sampler
- * @lirc_dev: lirc char device
+ * @lirc_dev: lirc device
+ * @lirc_cdev: lirc char cdev
  * @lirc_open: count of the number of times the device has been opened
  * @carrier_low: when setting the carrier range, first the low end must be
  *     set with an ioctl and then the high end with another ioctl
@@ -190,7 +191,8 @@ struct rc_dev {
        u32                             rx_resolution;
        u32                             tx_resolution;
 #ifdef CONFIG_LIRC
-       struct lirc_dev                 *lirc_dev;
+       struct device                   lirc_dev;
+       struct cdev                     lirc_cdev;
        int                             lirc_open;
        int                             carrier_low;
        ktime_t                         gap_start;