From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/13] ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h
Date: Tue, 09 Aug 2011 09:05:20 +0100 [thread overview]
Message-ID: <E1QqhJQ-0003a8-T9@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20110809080411.GA1831@n2100.arm.linux.org.uk>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
drivers/gpio/gpio-omap.c | 2 +-
drivers/input/keyboard/omap-keypad.c | 2 +-
drivers/mfd/menelaus.c | 2 +-
drivers/mmc/host/omap.c | 2 +-
drivers/mtd/nand/ams-delta.c | 2 +-
drivers/mtd/onenand/omap2.c | 2 +-
drivers/video/omap/lcd_apollon.c | 2 +-
drivers/video/omap/lcd_h3.c | 2 +-
drivers/video/omap/lcd_inn1610.c | 2 +-
drivers/video/omap/lcd_ldp.c | 2 +-
drivers/video/omap/lcd_osk.c | 2 +-
drivers/video/omap/lcd_overo.c | 2 +-
drivers/video/omap/lcd_palmtt.c | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 0599854..9c27244 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -25,7 +25,7 @@
#include <mach/hardware.h>
#include <asm/irq.h>
#include <mach/irqs.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
#include <asm/mach/irq.h>
struct gpio_bank {
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index 33d0bdc..323bcdf 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -35,7 +35,7 @@
#include <linux/mutex.h>
#include <linux/errno.h>
#include <linux/slab.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
#include <plat/keypad.h>
#include <plat/menelaus.h>
#include <asm/irq.h>
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 9cee8e7..af5d9d0 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -44,7 +44,7 @@
#include <asm/mach/irq.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
#include <plat/menelaus.h>
#define DRIVER_NAME "menelaus"
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index a6c3290..2dba999 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -33,7 +33,7 @@
#include <plat/board.h>
#include <plat/mmc.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
#include <plat/dma.h>
#include <plat/mux.h>
#include <plat/fpga.h>
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index 78017eb..9e6b498 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -26,7 +26,7 @@
#include <asm/io.h>
#include <mach/hardware.h>
#include <asm/sizes.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
#include <plat/board-ams-delta.h>
/*
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index a916dec..6a1d6d9 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -40,7 +40,7 @@
#include <asm/mach/flash.h>
#include <plat/gpmc.h>
#include <plat/onenand.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
#include <plat/dma.h>
diff --git a/drivers/video/omap/lcd_apollon.c b/drivers/video/omap/lcd_apollon.c
index 10459d8..4b24f54 100644
--- a/drivers/video/omap/lcd_apollon.c
+++ b/drivers/video/omap/lcd_apollon.c
@@ -24,7 +24,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
#include "omapfb.h"
diff --git a/drivers/video/omap/lcd_h3.c b/drivers/video/omap/lcd_h3.c
index 8df6887..622ad83 100644
--- a/drivers/video/omap/lcd_h3.c
+++ b/drivers/video/omap/lcd_h3.c
@@ -23,7 +23,7 @@
#include <linux/platform_device.h>
#include <linux/i2c/tps65010.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
#include "omapfb.h"
#define MODULE_NAME "omapfb-lcd_h3"
diff --git a/drivers/video/omap/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c
index 9fff86f..12cc52a 100644
--- a/drivers/video/omap/lcd_inn1610.c
+++ b/drivers/video/omap/lcd_inn1610.c
@@ -22,7 +22,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
#include "omapfb.h"
#define MODULE_NAME "omapfb-lcd_h3"
diff --git a/drivers/video/omap/lcd_ldp.c b/drivers/video/omap/lcd_ldp.c
index 0f5952c..0624664 100644
--- a/drivers/video/omap/lcd_ldp.c
+++ b/drivers/video/omap/lcd_ldp.c
@@ -26,7 +26,7 @@
#include <linux/delay.h>
#include <linux/i2c/twl.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
#include <plat/mux.h>
#include <asm/mach-types.h>
diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c
index b87e8b8..6f8d13c 100644
--- a/drivers/video/omap/lcd_osk.c
+++ b/drivers/video/omap/lcd_osk.c
@@ -23,7 +23,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
#include <plat/mux.h>
#include "omapfb.h"
diff --git a/drivers/video/omap/lcd_overo.c b/drivers/video/omap/lcd_overo.c
index 564933f..b8fd5b2 100644
--- a/drivers/video/omap/lcd_overo.c
+++ b/drivers/video/omap/lcd_overo.c
@@ -23,7 +23,7 @@
#include <linux/platform_device.h>
#include <linux/i2c/twl.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
#include <plat/mux.h>
#include <asm/mach-types.h>
diff --git a/drivers/video/omap/lcd_palmtt.c b/drivers/video/omap/lcd_palmtt.c
index ff0e6d7..b51b332 100644
--- a/drivers/video/omap/lcd_palmtt.c
+++ b/drivers/video/omap/lcd_palmtt.c
@@ -29,7 +29,7 @@ GPIO13 - screen blanking
#include <linux/module.h>
#include <linux/io.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
#include "omapfb.h"
static int palmtt_panel_init(struct lcd_panel *panel,
--
1.7.4.4
next prev parent reply other threads:[~2011-08-09 8:05 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-09 8:04 [PATCH 00/13] Clean up mach/gpio.h headers Russell King - ARM Linux
2011-08-09 8:04 ` [PATCH 01/13] ARM: gpio: at91: remove redundant include of mach/gpio.h Russell King - ARM Linux
2011-08-09 8:05 ` [PATCH 02/13] ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h Russell King - ARM Linux
2011-08-09 8:05 ` Russell King - ARM Linux [this message]
2011-08-29 18:20 ` [PATCH 03/13] ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h Kevin Hilman
2011-08-09 8:05 ` [PATCH 04/13] ARM: gpio: at91: " Russell King - ARM Linux
2011-08-09 8:06 ` [PATCH 05/13] ARM: gpio: nomadik: " Russell King - ARM Linux
2011-08-09 8:06 ` [PATCH 06/13] ARM: gpio: davinci: " Russell King - ARM Linux
2011-08-09 12:06 ` Sergei Shtylyov
2011-08-09 19:45 ` Russell King - ARM Linux
2011-08-09 8:06 ` [PATCH 07/13] ARM: gpio: pnx4008: " Russell King - ARM Linux
2011-08-09 8:07 ` [PATCH 08/13] ARM: gpio: ixp2000: " Russell King - ARM Linux
2011-08-09 8:07 ` [PATCH 09/13] ARM: gpio: tegra: " Russell King - ARM Linux
2011-08-09 8:07 ` [PATCH 10/13] ARM: gpio: pxa: " Russell King - ARM Linux
2011-08-09 8:08 ` [PATCH 11/13] ARM: gpio: consolidate trivial gpiolib implementations Russell King - ARM Linux
2011-08-09 17:02 ` H Hartley Sweeten
2011-08-09 17:59 ` David Brown
2011-08-10 7:54 ` Linus Walleij
2011-08-11 11:47 ` Kukjin Kim
2011-08-11 15:08 ` Russell King - ARM Linux
2011-08-11 16:24 ` David Brown
2011-08-11 14:15 ` Felipe Balbi
2011-08-11 15:07 ` Russell King - ARM Linux
2011-08-11 18:50 ` Felipe Balbi
2011-08-12 5:54 ` Shawn Guo
2011-08-29 18:23 ` Kevin Hilman
2011-08-09 8:08 ` [PATCH 12/13] ARM: gpio: consolidate gpio_to_irq Russell King - ARM Linux
2011-08-11 11:58 ` Kukjin Kim
2011-08-09 8:08 ` [PATCH 13/13] ARM: gpio: make trivial GPIOLIB implementation the default Russell King - ARM Linux
2011-08-09 17:04 ` H Hartley Sweeten
2011-08-11 12:02 ` Kukjin Kim
2011-08-09 9:58 ` [PATCH 00/13] Clean up mach/gpio.h headers Jamie Iles
2011-08-09 21:00 ` Grant Likely
2011-08-09 21:32 ` Russell King - ARM Linux
2011-08-09 21:50 ` Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1QqhJQ-0003a8-T9@rmk-PC.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).