The following commit has been merged in the linux branch: commit f5bae56a501347671b18095731d78e13eee5205f Author: Mike Frysinger vapier@gentoo.org Date: Thu Sep 24 15:11:37 2009 -0400
mtd/maps: gpio-addr-flash: pull in linux/ headers rather than asm/
Now that there are linux/ versions of gpio.h and io.h, include those rather than hitting the asm/ versions.
Signed-off-by: Mike Frysinger vapier@gentoo.org Signed-off-by: David Woodhouse David.Woodhouse@intel.com
diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c index 44ef9a4..1ad5caf 100644 --- a/drivers/mtd/maps/gpio-addr-flash.c +++ b/drivers/mtd/maps/gpio-addr-flash.c @@ -13,7 +13,9 @@ * Licensed under the GPL-2 or later. */
+#include <linux/gpio.h> #include <linux/init.h> +#include <linux/io.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/mtd/mtd.h> @@ -23,9 +25,6 @@ #include <linux/platform_device.h> #include <linux/types.h>
-#include <asm/gpio.h> -#include <asm/io.h> - #define pr_devinit(fmt, args...) ({ static const __devinitconst char __fmt[] = fmt; printk(__fmt, ## args); })
#define DRIVER_NAME "gpio-addr-flash"