diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 15:59:18 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 17:35:50 +0200 |
| commit | 090a80cba39f2763a488b6f7c65e38922d5aa17a (patch) | |
| tree | ba3797eeca74c42be95bc592ed2db1be99e329d2 /arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h | |
| parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
| parent | eb3f995d7e73fd78b8fcdc55cfbf01a74a09a6e8 (diff) | |
| download | linux-090a80cba39f2763a488b6f7c65e38922d5aa17a.tar.gz linux-090a80cba39f2763a488b6f7c65e38922d5aa17a.tar.xz linux-090a80cba39f2763a488b6f7c65e38922d5aa17a.zip | |
Merge branch 'spear/13xx' into next/soc2
* spear/13xx:
pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res
SPEAr: Update MAINTAINERS and Documentation
SPEAr13xx: Add defconfig
SPEAr13xx: Add compilation support
SPEAr13xx: Add dts and dtsi files
pinctrl: Add SPEAr13xx pinctrl drivers
pinctrl: SPEAr: Create macro for declaring GPIO PINS
SPEAr13xx: Add common clock framework support
SPEAr13xx: Add source files
SPEAr13xx: Add header files
Depends on clock, pinctrl and dt branches to go first.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h')
| -rw-r--r-- | arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h b/arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/arch/arm/mach-spear13xx/include/mach/spear1310_misc_regs.h |