diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-04 21:45:08 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-08 00:08:26 -0500 |
| commit | daaeec936fe43f7f3f15e61e1da86f1fa1c37e3e (patch) | |
| tree | 2290013d78edd149839a462903c7aa02598a8cb1 /arch/arm/mach-nomadik/board-nhk8815.c | |
| parent | 1ddda1cd235e05961bada337f87494272701c189 (diff) | |
| parent | d9621176872319a568d9892701410bcbfbd5b35c (diff) | |
Merge tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into fixes
From Linus Walleij:
Two fixes to the Nomadik:
- Delete a dangling include
- Bump IRQ numbers to offset at 32
* tag 'nomadik-fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: nomadik: bump the IRQ numbers again
ARM: nomadik: delete dangling include
Diffstat (limited to 'arch/arm/mach-nomadik/board-nhk8815.c')
| -rw-r--r-- | arch/arm/mach-nomadik/board-nhk8815.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index 98167a4319f7..9f19069248da 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/pinctrl/machine.h> | 27 | #include <linux/pinctrl/machine.h> |
| 28 | #include <linux/platform_data/pinctrl-nomadik.h> | 28 | #include <linux/platform_data/pinctrl-nomadik.h> |
| 29 | #include <linux/platform_data/clocksource-nomadik-mtu.h> | 29 | #include <linux/platform_data/clocksource-nomadik-mtu.h> |
| 30 | #include <linux/platform_data/mtd-nomadik-nand.h> | ||
| 31 | #include <asm/hardware/vic.h> | 30 | #include <asm/hardware/vic.h> |
| 32 | #include <asm/sizes.h> | 31 | #include <asm/sizes.h> |
| 33 | #include <asm/mach-types.h> | 32 | #include <asm/mach-types.h> |