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 / ene_ir.h

diff --git a/drivers/media/IR/ene_ir.h b/drivers/media/rc/ene_ir.h
similarity index 98%
rename from drivers/media/IR/ene_ir.h
rename to drivers/media/rc/ene_ir.h
index f5870667a4336e04d81c377840d2d31d0e30e54c..337a41d4450ba2aee45171cfc7e92117baf7e24e 100644 (file)
--- a/drivers/media/IR/ene_ir.h
+++ b/drivers/media/rc/ene_ir.h
@@ -201,12 +201,9 @@
 #define dbg_verbose(format, ...)       __dbg(2, format, ## __VA_ARGS__)
 #define dbg_regs(format, ...)          __dbg(3, format, ## __VA_ARGS__)
 
-#define MS_TO_NS(msec) ((msec) * 1000)
-
 struct ene_device {
        struct pnp_dev *pnp_dev;
-       struct input_dev *idev;
-       struct ir_dev_props *props;
+       struct rc_dev *rdev;
 
        /* hw IO settings */
        long hw_io;