git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c64xx
/
include
/
mach
/
gpio.h
diff --git
a/arch/arm/mach-s3c64xx/include/mach/gpio.h
b/arch/arm/mach-s3c64xx/include/mach/gpio.h
index
0d46e99
..
6e34c2f
100644
(file)
--- a/
arch/arm/mach-s3c64xx/include/mach/gpio.h
+++ b/
arch/arm/mach-s3c64xx/include/mach/gpio.h
@@
-12,11
+12,6
@@
* published by the Free Software Foundation.
*/
* published by the Free Software Foundation.
*/
-#define gpio_get_value __gpio_get_value
-#define gpio_set_value __gpio_set_value
-#define gpio_cansleep __gpio_cansleep
-#define gpio_to_irq __gpio_to_irq
-
/* GPIO bank sizes */
#define S3C64XX_GPIO_A_NR (8)
#define S3C64XX_GPIO_B_NR (7)
/* GPIO bank sizes */
#define S3C64XX_GPIO_A_NR (8)
#define S3C64XX_GPIO_B_NR (7)
@@
-96,5
+91,3
@@
enum s3c_gpio_number {
#define BOARD_NR_GPIOS 16
#define ARCH_NR_GPIOS (GPIO_BOARD_START + BOARD_NR_GPIOS)
#define BOARD_NR_GPIOS 16
#define ARCH_NR_GPIOS (GPIO_BOARD_START + BOARD_NR_GPIOS)
-
-#include <asm-generic/gpio.h>