diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-13 16:25:57 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 09:00:53 +0100 |
| commit | f2179e9a14c55558b3bacebef64d06bbd7149e19 (patch) | |
| tree | 274772d33f14fc997b43209f50883629f7c26e9f /arch/arm/mach-ux500/include/mach | |
| parent | e499b3818ffdb53a8b4dc7e97099aa322403eaee (diff) | |
mach-ux500: gpio: audio: Moved the NOMADIK_NR_GPIO
Move the NOMADIK_NR_GPIO to the right
location.
Fix warnings generated by this change.
ST-Ericsson Linux next: ER 340134
ST-Ericsson ID: 340139
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Change-Id: I5b69d4a4662b707d815a867b2b5be19e4675d010
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24082
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/include/mach')
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/msp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/include/mach/msp.h b/arch/arm/mach-ux500/include/mach/msp.h index aecca3a59a3..ce6ec08e08d 100644 --- a/arch/arm/mach-ux500/include/mach/msp.h +++ b/arch/arm/mach-ux500/include/mach/msp.h @@ -16,7 +16,7 @@ #include <linux/irqreturn.h> #include <linux/bitops.h> #include <plat/ste_dma40.h> -#include <mach/gpio.h> +#include <linux/gpio.h> #include <linux/spi/stm_msp.h> /* Generic config struct. Use the actual values defined below for global |