diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-30 10:04:01 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-30 10:04:01 -0700 |
commit | f54496f55a729078e9eef90bf9e0783857a27db1 (patch) | |
tree | 104cf71ea8349a35990a9d3b58679229a604df31 /include/asm-arm/arch-s3c2410/regs-gpioj.h | |
parent | aa2d3322989d8fd40fb2e417142c9a029d7831a4 (diff) | |
parent | cdea460643072e1ee3647434aa254b5b81364f68 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Fix some section mismatch warnings
[ARM] 4417/1: Serial: Fix AMBA drivers locking
[ARM] 4394/1: ARMv7: Add the TLB range operations
[ARM] 4410/1: Remove extern declarations in coyote/ixdpg425-pci.c
[ARM] 4416/1: NWFPE: fix undeclared symbols
[ARM] 4415/1: AML5900: fix sparse warnings from map_io
[ARM] 4414/1: S3C2443: sparse fix for clock.c
[ARM] 4412/1: S3C2412: reset errata fix
[ARM] 4411/1: KS8695: Another serial driver fix
[ARM] oprofile: avoid lockdep warnings on mpcore oprofile init
[ARM] Fix stacktrace FP range checking
[ARM] use __used attribute
[ARM] enable arbitary speed tty ioctls and split input/output speed
[ARM] remove unused header file: arch/arm/mach-s3c2410/bast.h
[ARM] 4406/1: Trivial NSLU2 / NAS-100D header & setup code cleanup
[ARM] 4405/1: NSLU2, DSM-G600 frequency fixup code
[ARM] 4404/1: Trivial IXP42x Kconfig cleanup
[ARM] 4403/1: Make the PXA-I2C driver work with lockdep validator
[ARM] 4402/1: S3C2443: Add physical address of HSMMC controller
[ARM] 4401/1: S3C2443: Add definitions for port GPIOJ
Diffstat (limited to 'include/asm-arm/arch-s3c2410/regs-gpioj.h')
-rw-r--r-- | include/asm-arm/arch-s3c2410/regs-gpioj.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-arm/arch-s3c2410/regs-gpioj.h b/include/asm-arm/arch-s3c2410/regs-gpioj.h index 02131a5a1d3..0362332faaf 100644 --- a/include/asm-arm/arch-s3c2410/regs-gpioj.h +++ b/include/asm-arm/arch-s3c2410/regs-gpioj.h @@ -98,5 +98,9 @@ #define S3C2440_GPJ12_OUTP (0x01 << 24) #define S3C2440_GPJ12_CAMRESET (0x02 << 24) +#define S3C2443_GPJ13 S3C2410_GPIONO(S3C2440_GPIO_BANKJ, 13) +#define S3C2443_GPJ14 S3C2410_GPIONO(S3C2440_GPIO_BANKJ, 14) +#define S3C2443_GPJ15 S3C2410_GPIONO(S3C2440_GPIO_BANKJ, 15) + #endif /* __ASM_ARCH_REGS_GPIOJ_H */ |