diff options
| author | Andres Salomon <dilinger@queued.net> | 2011-01-13 01:00:11 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 16:03:13 (GMT) |
| commit | 7637c9259f7b6dd841471ccf1120d484b7364f99 (patch) | |
| tree | 1284edad0917aafa6b9fab7e2f98f460b671d2dc /drivers/staging/olpc_dcon/olpc_dcon.c | |
| parent | 1b912c1bca5c162e611384fe7d39c916e081701a (diff) | |
| download | linux-fsl-qoriq-7637c9259f7b6dd841471ccf1120d484b7364f99.tar.xz | |
drivers/staging/olpc_dcon: convert to new cs5535 gpio API
Drop the old geode_gpio crud, as well as the raw outl() calls; instead,
use the Linux GPIO API where possible, and the cs5535_gpio API in other
places.
Note that we don't actually clean up the driver properly yet (once loaded,
it always remains loaded). That'll come later..
This patch is necessary for building the driver.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/staging/olpc_dcon/olpc_dcon.c')
| -rw-r--r-- | drivers/staging/olpc_dcon/olpc_dcon.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c index 4ca45ec..da040c1 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon.c +++ b/drivers/staging/olpc_dcon/olpc_dcon.c @@ -27,7 +27,6 @@ #include <asm/uaccess.h> #include <linux/ctype.h> #include <linux/reboot.h> -#include <linux/gpio.h> #include <asm/tsc.h> #include <asm/olpc.h> @@ -49,7 +48,7 @@ struct dcon_platform_data { int (*init)(void); void (*bus_stabilize_wiggle)(void); void (*set_dconload)(int); - int (*read_status)(void); + u8 (*read_status)(void); }; static struct dcon_platform_data *pdata; |