Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / rc / nuvoton-cir.h

diff --git a/drivers/media/IR/nuvoton-cir.h b/drivers/media/rc/nuvoton-cir.h
similarity index 98%
rename from drivers/media/IR/nuvoton-cir.h
rename to drivers/media/rc/nuvoton-cir.h
index 62dc53017c8ecd1aa32a24d7cda284d084576b00..048135eea70201e12cc63a103334e9c8606d45fa 100644 (file)
--- a/drivers/media/IR/nuvoton-cir.h
+++ b/drivers/media/rc/nuvoton-cir.h
@@ -66,8 +66,7 @@ static int debug;
 
 struct nvt_dev {
        struct pnp_dev *pdev;
-       struct input_dev *rdev;
-       struct ir_dev_props *props;
+       struct rc_dev *rdev;
        struct ir_raw_event rawir;
 
        spinlock_t nvt_lock;
@@ -306,8 +305,11 @@ struct nvt_dev {
 #define CIR_WAKE_IRFIFOSTS_RX_EMPTY    0x20
 #define CIR_WAKE_IRFIFOSTS_RX_FULL     0x10
 
-/* CIR Wake FIFO buffer is 67 bytes long */
-#define CIR_WAKE_FIFO_LEN              67
+/*
+ * The CIR Wake FIFO buffer is 67 bytes long, but the stock remote wakes
+ * the system comparing only 65 bytes (fails with this set to 67)
+ */
+#define CIR_WAKE_FIFO_CMP_BYTES                65
 /* CIR Wake byte comparison tolerance */
 #define CIR_WAKE_CMP_TOLERANCE         5