diff options
| author | Jonas Bonn <jonas.bonn@gmail.com> | 2008-11-19 17:11:02 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:11:02 +0000 |
| commit | 4ebc574062d8aed2cb662a8360bc3c1222d5047b (patch) | |
| tree | be27e167622ce9dd16339e7ce2f156ab71e8097a /drivers | |
| parent | e98ad875b68c1205d30182d7a77391e6ae91c4ad (diff) | |
[ARM]: Move asm/arch/gpio.h to mach/ directory
This file was moved in the big file move, but some OpenMoko specific
changes did not make it. This patch peels out the relevant bits and
adds them to the gpio.h file in the upstream location.
The only OpenMoko specific change is the definition of gpio_to_irq and
irq_to_gpio. These functions should really be defined in gpio_chip and
asm-generic/gpio.h; this is coming soon, but until then we'll just use
the Moko definitions that we've been using up until now.
This is not strictly correct for the GTA02 case, but it works given
the configuration that's currently in use. This can be fixed (and
should become evident) when the configuration options are cleaned up.
Signed-off-by: Jonas Bonn <jonas.bonn@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 2 | ||||
| -rw-r--r-- | drivers/input/keyboard/gpio_keys.c | 2 | ||||
| -rw-r--r-- | drivers/input/keyboard/neo1973kbd.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 753a50c1ece..e33adc4dc05 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -6,7 +6,7 @@ #include <linux/err.h> #include <linux/debugfs.h> #include <linux/seq_file.h> -#include <asm/arch/gpio.h> +#include <mach/gpio.h> /* Optional implementation infrastructure for GPIO interfaces. * diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index b78d6d876e6..09b70bbc3af 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -23,7 +23,7 @@ #include <linux/input.h> #include <linux/gpio_keys.h> -#include <asm/arch/gpio.h> +#include <mach/gpio.h> struct gpio_button_data { struct gpio_keys_button *button; diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c index 4d8654c6710..2262a30859f 100644 --- a/drivers/input/keyboard/neo1973kbd.c +++ b/drivers/input/keyboard/neo1973kbd.c @@ -23,7 +23,7 @@ #include <linux/slab.h> #include <linux/workqueue.h> -#include <asm/arch/gpio.h> +#include <mach/gpio.h> #include <asm/mach-types.h> struct neo1973kbd { |