diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-15 17:12:58 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-15 17:12:58 -0400 |
| commit | 1e09481365ce248dbb4eb06dad70129bb5807037 (patch) | |
| tree | c0cff5bef95c8b5e7486f144718ade9a06c284dc /include/asm-arm/arch-iop33x/gpio.h | |
| parent | 3e2f69fdd1b00166e7d589bce56b2d36a9e74374 (diff) | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
Merge branch 'linus' into core/softlockup
Conflicts:
kernel/softlockup.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-arm/arch-iop33x/gpio.h')
| -rw-r--r-- | include/asm-arm/arch-iop33x/gpio.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-arm/arch-iop33x/gpio.h b/include/asm-arm/arch-iop33x/gpio.h new file mode 100644 index 000000000000..ddd55bba9bb9 --- /dev/null +++ b/include/asm-arm/arch-iop33x/gpio.h | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | #ifndef __ASM_ARCH_IOP33X_GPIO_H | ||
| 2 | #define __ASM_ARCH_IOP33X_GPIO_H | ||
| 3 | |||
| 4 | #include <asm/hardware/iop3xx-gpio.h> | ||
| 5 | |||
| 6 | #endif | ||