diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /include/asm-arm/arch-pxa/hardware.h | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'include/asm-arm/arch-pxa/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/hardware.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h index 3e70bd95472c..e2bdc2fbede1 100644 --- a/include/asm-arm/arch-pxa/hardware.h +++ b/include/asm-arm/arch-pxa/hardware.h | |||
| @@ -65,7 +65,17 @@ | |||
| 65 | /* | 65 | /* |
| 66 | * Handy routine to set GPIO alternate functions | 66 | * Handy routine to set GPIO alternate functions |
| 67 | */ | 67 | */ |
| 68 | extern void pxa_gpio_mode( int gpio_mode ); | 68 | extern int pxa_gpio_mode( int gpio_mode ); |
| 69 | |||
| 70 | /* | ||
| 71 | * Return GPIO level, nonzero means high, zero is low | ||
| 72 | */ | ||
| 73 | extern int pxa_gpio_get_value(unsigned gpio); | ||
| 74 | |||
| 75 | /* | ||
| 76 | * Set output GPIO level | ||
| 77 | */ | ||
| 78 | extern void pxa_gpio_set_value(unsigned gpio, int value); | ||
| 69 | 79 | ||
| 70 | /* | 80 | /* |
| 71 | * Routine to enable or disable CKEN | 81 | * Routine to enable or disable CKEN |