diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 14:38:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-08 14:38:42 -0400 |
| commit | 49b75b87ce2dfbd99e59a50c3681b154d07e3a22 (patch) | |
| tree | f14e1da19a13d87a512f9043c2f37fd75dd122b3 /Documentation/arm/Samsung-S3C24XX/GPIO.txt | |
| parent | f1c7f79b6ab4f7ada002a0fae47f462ede6b6857 (diff) | |
| parent | 097d9eb537ff4d88b74c3fe67392e27c478ca3c5 (diff) | |
Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB
[ARM] 5166/1: magician: add MAINTAINERS entry
[ARM] fix pnx4008 build errors
[ARM] Fix SMP booting with non-zero PHYS_OFFSET
[ARM] 5185/1: Fix spi num_chipselect for lubbock
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
[ARM] Add support for arch/arm/mach-*/include and arch/arm/plat-*/include
[ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead
[ARM] Eliminate useless includes of asm/mach-types.h
[ARM] Fix circular include dependency with IRQ headers
avr32: Use <mach/foo.h> instead of <asm/arch/foo.h>
avr32: Introduce arch/avr32/mach-*/include/mach
avr32: Move include/asm-avr32 to arch/avr32/include/asm
[ARM] sa1100_wdt: use reset_status to remember watchdog reset status
[ARM] pxa: introduce reset_status and clear_reset_status for driver's usage
[ARM] pxa: introduce reset.h for reset specific header information
Diffstat (limited to 'Documentation/arm/Samsung-S3C24XX/GPIO.txt')
| -rw-r--r-- | Documentation/arm/Samsung-S3C24XX/GPIO.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/arm/Samsung-S3C24XX/GPIO.txt b/Documentation/arm/Samsung-S3C24XX/GPIO.txt index 8caea8c237ee..b5d20c0b2ab4 100644 --- a/Documentation/arm/Samsung-S3C24XX/GPIO.txt +++ b/Documentation/arm/Samsung-S3C24XX/GPIO.txt | |||
| @@ -16,13 +16,13 @@ Introduction | |||
| 16 | Headers | 16 | Headers |
| 17 | ------- | 17 | ------- |
| 18 | 18 | ||
| 19 | See include/asm-arm/arch-s3c2410/regs-gpio.h for the list | 19 | See arch/arm/mach-s3c2410/include/mach/regs-gpio.h for the list |
| 20 | of GPIO pins, and the configuration values for them. This | 20 | of GPIO pins, and the configuration values for them. This |
| 21 | is included by using #include <asm/arch/regs-gpio.h> | 21 | is included by using #include <mach/regs-gpio.h> |
| 22 | 22 | ||
| 23 | The GPIO management functions are defined in the hardware | 23 | The GPIO management functions are defined in the hardware |
| 24 | header include/asm-arm/arch-s3c2410/hardware.h which can be | 24 | header arch/arm/mach-s3c2410/include/mach/hardware.h which can be |
| 25 | included by #include <asm/arch/hardware.h> | 25 | included by #include <mach/hardware.h> |
| 26 | 26 | ||
| 27 | A useful amount of documentation can be found in the hardware | 27 | A useful amount of documentation can be found in the hardware |
| 28 | header on how the GPIO functions (and others) work. | 28 | header on how the GPIO functions (and others) work. |