diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/arm/mach-pxa/include/mach/reset.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/reset.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/reset.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/include/mach/reset.h b/arch/arm/mach-pxa/include/mach/reset.h index 9489a48871a8..7b8842cfa5fc 100644 --- a/arch/arm/mach-pxa/include/mach/reset.h +++ b/arch/arm/mach-pxa/include/mach/reset.h | |||
| @@ -10,9 +10,12 @@ | |||
| 10 | extern unsigned int reset_status; | 10 | extern unsigned int reset_status; |
| 11 | extern void clear_reset_status(unsigned int mask); | 11 | extern void clear_reset_status(unsigned int mask); |
| 12 | 12 | ||
| 13 | /* | 13 | /** |
| 14 | * register GPIO as reset generator | 14 | * init_gpio_reset() - register GPIO as reset generator |
| 15 | * | ||
| 16 | * @gpio - gpio nr | ||
| 17 | * @output - set gpio as out/low instead of input during normal work | ||
| 15 | */ | 18 | */ |
| 16 | extern int init_gpio_reset(int gpio); | 19 | extern int init_gpio_reset(int gpio, int output); |
| 17 | 20 | ||
| 18 | #endif /* __ASM_ARCH_RESET_H */ | 21 | #endif /* __ASM_ARCH_RESET_H */ |