diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 10:19:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 10:19:57 -0800 |
| commit | d52739c62e0096dccea59f012d80256c6e359a98 (patch) | |
| tree | 4df8ae0640c360eb79b6d0511f084b2337e21e12 /arch/arm/mach-u300/include/mach/irqs.h | |
| parent | Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev (diff) | |
| parent | pinctrl: remove unnecessary max pin number (diff) | |
| download | linux-dev-d52739c62e0096dccea59f012d80256c6e359a98.tar.xz linux-dev-d52739c62e0096dccea59f012d80256c6e359a98.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (31 commits)
pinctrl: remove unnecessary max pin number
pinctrl: correct a offset while enumerating pins
pinctrl: some typo fixes
pinctrl: rename U300 and SIRF pin controllers
pinctrl: pass name instead of device to pin_config_*
pinctrl: add "struct seq_file;" to pinconf.h
pinctrl: conjure names for unnamed pins
pinctrl: add a group-specific hog macro
pinctrl: don't create a device for each pin controller
arm/u300: don't use PINMUX_MAP_PRIMARY*
pinctrl: implement PINMUX_MAP_SYS_HOG
pinctrl: add a pin config interface
pinctrl/coh901: driver to request its pins
pinctrl: u300-pinmux: register proper GPIO ranges
pinctrl: move the U300 GPIO driver to pinctrl
ARM: u300: localize GPIO assignments
pinctrl: make it possible to add multiple maps
pinctrl: make a copy of pinmux map
pinctrl: GPIO direction support for muxing
pinctrl: print pin range in GPIO range debugs
...
Diffstat (limited to 'arch/arm/mach-u300/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-u300/include/mach/irqs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/include/mach/irqs.h b/arch/arm/mach-u300/include/mach/irqs.h index db3fbfa1d6e9..ee78a26707eb 100644 --- a/arch/arm/mach-u300/include/mach/irqs.h +++ b/arch/arm/mach-u300/include/mach/irqs.h @@ -110,7 +110,7 @@ #endif /* Maximum 8*7 GPIO lines */ -#ifdef CONFIG_GPIO_U300 +#ifdef CONFIG_PINCTRL_COH901 #define IRQ_U300_GPIO_BASE (U300_VIC_IRQS_END) #define IRQ_U300_GPIO_END (IRQ_U300_GPIO_BASE + 56) #else |