LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: David Brownell <david-b@pacbell.net>
To: Dmitry Torokhov <dtor@mail.ru>, pHilipp Zabel <philipp.zabel@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Haavard Skinnemoen <hskinnemoen@atmel.com>,
Linux Kernel list <linux-kernel@vger.kernel.org>
Subject: [patch 2.6.21-rc2] gpio_keys driver shouldn't be ARM-specific
Date: Thu, 1 Mar 2007 15:51:29 -0800 [thread overview]
Message-ID: <200703011551.29696.david-b@pacbell.net> (raw)
The gpio_keys driver is wrongly ARM-specific; it can't build on
other platforms with GPIO suport. This fixes that problem.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---
MERGE NOTE: this just moves gpio_keys.h; this patch does no GIT magic
include/asm-arm/hardware/gpio_keys.h | 17 -----------------
drivers/input/keyboard/gpio_keys.c | 4 +---
include/linux/gpio_keys.h | 17 +++++++++++++++++
3 files changed, 18 insertions(+), 20 deletions(-)
Index: ap7000/drivers/input/keyboard/gpio_keys.c
===================================================================
--- ap7000.orig/drivers/input/keyboard/gpio_keys.c 2007-03-01 12:24:26.000000000 -0800
+++ ap7000/drivers/input/keyboard/gpio_keys.c 2007-03-01 12:25:54.000000000 -0800
@@ -23,11 +23,9 @@
#include <linux/platform_device.h>
#include <linux/input.h>
#include <linux/irq.h>
+#include <linux/gpio_keys.h>
#include <asm/gpio.h>
-#include <asm/arch/hardware.h>
-
-#include <asm/hardware/gpio_keys.h>
static irqreturn_t gpio_keys_isr(int irq, void *dev_id)
{
Index: ap7000/include/asm-arm/hardware/gpio_keys.h
===================================================================
--- ap7000.orig/include/asm-arm/hardware/gpio_keys.h 2007-03-01 11:49:06.000000000 -0800
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-#ifndef _GPIO_KEYS_H
-#define _GPIO_KEYS_H
-
-struct gpio_keys_button {
- /* Configuration parameters */
- int keycode;
- int gpio;
- int active_low;
- char *desc;
-};
-
-struct gpio_keys_platform_data {
- struct gpio_keys_button *buttons;
- int nbuttons;
-};
-
-#endif
Index: ap7000/include/linux/gpio_keys.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ ap7000/include/linux/gpio_keys.h 2007-03-01 12:24:58.000000000 -0800
@@ -0,0 +1,17 @@
+#ifndef _GPIO_KEYS_H
+#define _GPIO_KEYS_H
+
+struct gpio_keys_button {
+ /* Configuration parameters */
+ int keycode;
+ int gpio;
+ int active_low;
+ char *desc;
+};
+
+struct gpio_keys_platform_data {
+ struct gpio_keys_button *buttons;
+ int nbuttons;
+};
+
+#endif
next reply other threads:[~2007-03-01 23:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-01 23:51 David Brownell [this message]
2007-03-02 0:18 ` Ben Nizette
2007-03-02 0:54 ` David Brownell
2007-03-02 2:21 ` Ben Nizette
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=200703011551.29696.david-b@pacbell.net \
--to=david-b@pacbell.net \
--cc=akpm@linux-foundation.org \
--cc=dtor@mail.ru \
--cc=hskinnemoen@atmel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=philipp.zabel@gmail.com \
--subject='Re: [patch 2.6.21-rc2] gpio_keys driver shouldn'\''t be ARM-specific' \
/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
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).