diff options
author | Dan Williams <dan.j.williams@intel.com> | 2015-08-11 05:07:05 +0200 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2015-08-11 05:07:05 +0200 |
commit | 2584cf83578c26db144730ef498f4070f82ee3ea (patch) | |
tree | e8c5ab5140ca2425aacc5d73335072c94afbf831 /drivers/video | |
parent | mm: enhance region_is_ram() to region_intersects() (diff) | |
download | linux-2584cf83578c26db144730ef498f4070f82ee3ea.tar.xz linux-2584cf83578c26db144730ef498f4070f82ee3ea.zip |
arch, drivers: don't include <asm/io.h> directly, use <linux/io.h> instead
Preparation for uniform definition of ioremap, ioremap_wc, ioremap_wt,
and ioremap_cache, tree-wide.
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/fbdev/s1d13xxxfb.c | 3 | ||||
-rw-r--r-- | drivers/video/fbdev/stifb.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c index 83433cb0dfba..96aa46dc696c 100644 --- a/drivers/video/fbdev/s1d13xxxfb.c +++ b/drivers/video/fbdev/s1d13xxxfb.c @@ -32,8 +32,7 @@ #include <linux/spinlock_types.h> #include <linux/spinlock.h> #include <linux/slab.h> - -#include <asm/io.h> +#include <linux/io.h> #include <video/s1d13xxxfb.h> diff --git a/drivers/video/fbdev/stifb.c b/drivers/video/fbdev/stifb.c index 735355b0e023..7df4228e25f0 100644 --- a/drivers/video/fbdev/stifb.c +++ b/drivers/video/fbdev/stifb.c @@ -64,6 +64,7 @@ #include <linux/fb.h> #include <linux/init.h> #include <linux/ioport.h> +#include <linux/io.h> #include <asm/grfioctl.h> /* for HP-UX compatibility */ #include <asm/uaccess.h> |