diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-15 19:31:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-15 19:31:05 -0500 |
| commit | a3dd15444baa9c7522c8457ab564c41219dfb44c (patch) | |
| tree | 0571fdb4d7201376c03f474e2023144de62e8f1c /arch/arm/mach-pxa | |
| parent | 7004405cb85cdc10074740705963d9ce3e887f47 (diff) | |
| parent | 1ada1441e73a0f51296bfae527acbeae61ff0d52 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5348/1: fix documentation wrt location of the alignment trap interface
[ARM] Ensure linux/hardirqs.h is included where required
[ARM] fix kernel-doc syntax
[ARM] arch/arm/common/sa1111.c: Correct error handling code
[ARM] 5341/2: there is no copy_page on nommu ARM
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/reset.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/include/mach/reset.h b/arch/arm/mach-pxa/include/mach/reset.h index 7b8842cfa5fc..31e6a7b6ad80 100644 --- a/arch/arm/mach-pxa/include/mach/reset.h +++ b/arch/arm/mach-pxa/include/mach/reset.h | |||
| @@ -12,9 +12,8 @@ extern void clear_reset_status(unsigned int mask); | |||
| 12 | 12 | ||
| 13 | /** | 13 | /** |
| 14 | * init_gpio_reset() - register GPIO as reset generator | 14 | * init_gpio_reset() - register GPIO as reset generator |
| 15 | * | 15 | * @gpio: gpio nr |
| 16 | * @gpio - gpio nr | 16 | * @output: set gpio as out/low instead of input during normal work |
| 17 | * @output - set gpio as out/low instead of input during normal work | ||
| 18 | */ | 17 | */ |
| 19 | extern int init_gpio_reset(int gpio, int output); | 18 | extern int init_gpio_reset(int gpio, int output); |
| 20 | 19 | ||