diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-28 17:40:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-28 17:40:39 -0400 |
| commit | ebdea46fecae40c4d7effcd33f40918a37a1df4b (patch) | |
| tree | e4312bf7f1f3d184738963a0ec300aa9fdfd55c1 /arch/arm/mach-s3c2410/gpio.c | |
| parent | fecf3404f4aba6d0edeba31eeb018cbb6326dff2 (diff) | |
| parent | 250d375d1da45a5e08ab8baf5eaa7eb258afd82b (diff) | |
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (130 commits)
[ARM] 3856/1: Add clocksource for Intel IXP4xx platforms
[ARM] 3855/1: Add generic time support
[ARM] 3873/1: S3C24XX: Add irq_chip names
[ARM] 3872/1: S3C24XX: Apply consistant tabbing to irq_chips
[ARM] 3871/1: S3C24XX: Fix ordering of EINT4..23
[ARM] nommu: confirms the CR_V bit in nommu mode
[ARM] nommu: abort handler fixup for !CPU_CP15_MMU cores.
[ARM] 3870/1: AT91: Start removing static memory mappings
[ARM] 3869/1: AT91: NAND support for DK and KB9202 boards
[ARM] 3868/1: AT91 hardware header update
[ARM] 3867/1: AT91 GPIO update
[ARM] 3866/1: AT91 clock update
[ARM] 3865/1: AT91RM9200 header updates
[ARM] 3862/2: S3C2410 - add basic power management support for AML M5900 series
[ARM] kthread: switch arch/arm/kernel/apm.c
[ARM] Off-by-one in arch/arm/common/icst*
[ARM] 3864/1: Refactore sharpsl_pm
[ARM] 3863/1: Add Locomo SPI Device
[ARM] 3847/2: Convert LOMOMO to use struct device for GPIOs
[ARM] Use CPU_CACHE_* where possible in asm/cacheflush.h
...
Diffstat (limited to 'arch/arm/mach-s3c2410/gpio.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/gpio.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm/mach-s3c2410/gpio.c b/arch/arm/mach-s3c2410/gpio.c index cd39e8684584..db6393c99860 100644 --- a/arch/arm/mach-s3c2410/gpio.c +++ b/arch/arm/mach-s3c2410/gpio.c | |||
| @@ -18,21 +18,7 @@ | |||
| 18 | * You should have received a copy of the GNU General Public License | 18 | * You should have received a copy of the GNU General Public License |
| 19 | * along with this program; if not, write to the Free Software | 19 | * along with this program; if not, write to the Free Software |
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 21 | * | 21 | */ |
| 22 | * Changelog | ||
| 23 | * 13-Sep-2004 BJD Implemented change of MISCCR | ||
| 24 | * 14-Sep-2004 BJD Added getpin call | ||
| 25 | * 14-Sep-2004 BJD Fixed bug in setpin() call | ||
| 26 | * 30-Sep-2004 BJD Fixed cfgpin() mask bug | ||
| 27 | * 01-Oct-2004 BJD Added getcfg() to get pin configuration | ||
| 28 | * 01-Oct-2004 BJD Fixed mask bug in pullup() call | ||
| 29 | * 01-Oct-2004 BJD Added getirq() to turn pin into irqno | ||
| 30 | * 04-Oct-2004 BJD Added irq filter controls for GPIO | ||
| 31 | * 05-Nov-2004 BJD EXPORT_SYMBOL() added for all code | ||
| 32 | * 13-Mar-2005 BJD Updates for __iomem | ||
| 33 | * 26-Oct-2005 BJD Added generic configuration types | ||
| 34 | * 15-Jan-2006 LCVR Added support for the S3C2400 | ||
| 35 | */ | ||
| 36 | 22 | ||
| 37 | 23 | ||
| 38 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |