diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-06-05 23:05:47 +0200 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2014-11-19 23:27:38 +0100 |
commit | bd66de1b39f7694430862d9637475439be571d62 (patch) | |
tree | a431d87cd6fe3b0380754ec1cd7e6a0fe3e679f4 /drivers/tty | |
parent | 2948ce57731969aa662e0192d2df0749f1f21462 (diff) |
pcmcia: journada720: use sa1100 pin interfaces correctly
commit 58409f9d21a9d372e35857b5b8aaf334997b127b upstream.
commit dabd14684bc2 "PCMCIA: sa1111: remove duplicated initializers"
incorrectly moved some code into the pcmcia_jornada720_init, causing
a few build errors, and for unknown reasons, the driver lacks
an inclusion of <linux/io.h>, so we get the build errors, and more:
sa1111_jornada720.c: In function 'pcmcia_jornada720_init':
sa1111_jornada720.c:101:3: error: implicit declaration of function 'IOMEM' [-Werror=implicit-function-declaration]
GRER |= 0x00000002;
^
sa1111_jornada720.c:104:3: warning: passing argument 1 of 'sa1111_set_io_dir' from incompatible pointer type [enabled by default]
sa1111_set_io_dir(dev, pin, 0, 0);
^
This patch uses the SA1111_DEV() to convert the dev pointer to the
correct type before passing it and adds the missing include.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Cc: linux-pcmcia@lists.infradead.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/tty')
0 files changed, 0 insertions, 0 deletions