diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-06 03:25:16 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-13 04:12:07 -0500 |
| commit | 70d13e083c8589dd3edc2313777655da39cb3568 (patch) | |
| tree | 41478a4699b3cbc8c5598ccc1863ea058948741e /arch/arm/mach-footbridge/include | |
| parent | 7ec80ddf0455ff3854a5ca524952d91b5eb676b2 (diff) | |
[ARM] netwinder: clean up GPIO naming
Netwinder was using gpio_xxx names which could clash with the GPIO
layer. Add a 'nw_' prefix to ensure that these remain separate.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-footbridge/include')
| -rw-r--r-- | arch/arm/mach-footbridge/include/mach/hardware.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-footbridge/include/mach/hardware.h b/arch/arm/mach-footbridge/include/mach/hardware.h index ff44e0ce2e14..51dd902043ad 100644 --- a/arch/arm/mach-footbridge/include/mach/hardware.h +++ b/arch/arm/mach-footbridge/include/mach/hardware.h | |||
| @@ -86,10 +86,11 @@ | |||
| 86 | #define CPLD_FLASH_WR_ENABLE 1 | 86 | #define CPLD_FLASH_WR_ENABLE 1 |
| 87 | 87 | ||
| 88 | #ifndef __ASSEMBLY__ | 88 | #ifndef __ASSEMBLY__ |
| 89 | extern void gpio_modify_op(int mask, int set); | 89 | extern spinlock_t nw_gpio_lock; |
| 90 | extern void gpio_modify_io(int mask, int in); | 90 | extern void nw_gpio_modify_op(unsigned int mask, unsigned int set); |
| 91 | extern int gpio_read(void); | 91 | extern void nw_gpio_modify_io(unsigned int mask, unsigned int in); |
| 92 | extern void cpld_modify(int mask, int set); | 92 | extern unsigned int nw_gpio_read(void); |
| 93 | extern void nw_cpld_modify(unsigned int mask, unsigned int set); | ||
| 93 | #endif | 94 | #endif |
| 94 | 95 | ||
| 95 | #define pcibios_assign_all_busses() 1 | 96 | #define pcibios_assign_all_busses() 1 |