diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-05-19 16:12:32 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-05-19 16:12:32 +0200 |
commit | c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015 (patch) | |
tree | a80672ee82fcc3d9c8d486e53731eb19cd968eb0 /drivers/media/rc/ir-hix5hd2.c | |
parent | time: Allow gcc to fold constants when possible (diff) | |
parent | Linux 4.1-rc4 (diff) | |
download | linux-dev-c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015.tar.xz linux-dev-c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015.zip |
Merge branch 'linus' into timers/core
Make sure the upstream fixes are applied before adding further
modifications.
Diffstat (limited to 'drivers/media/rc/ir-hix5hd2.c')
-rw-r--r-- | drivers/media/rc/ir-hix5hd2.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/media/rc/ir-hix5hd2.c b/drivers/media/rc/ir-hix5hd2.c index b0df62961c14..58ec5986274e 100644 --- a/drivers/media/rc/ir-hix5hd2.c +++ b/drivers/media/rc/ir-hix5hd2.c @@ -16,14 +16,6 @@ #include <linux/regmap.h> #include <media/rc-core.h> -/* Allow the driver to compile on all architectures */ -#ifndef writel_relaxed -# define writel_relaxed writel -#endif -#ifndef readl_relaxed -# define readl_relaxed readl -#endif - #define IR_ENABLE 0x00 #define IR_CONFIG 0x04 #define CNT_LEADS 0x08 |