diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-02 21:33:58 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-02 21:33:58 -0400 |
| commit | 06b851e58b73a268f8092c2d990f697b2e7c53bd (patch) | |
| tree | a44e10462a39202b60636f8b102376a9c69169c1 /arch/arm64/Kconfig | |
| parent | 5f03dc2002f5dc85ce87e69caff7f28f17f5c9b2 (diff) | |
| parent | 17e7979f83c1de305fa81efb0aa7a3a56bd8121c (diff) | |
Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/soc
* 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6: (604 commits)
ARM: LPC32xx: defconfig update: Cleanup (EXPERIMENTAL)
ARM: LPC32xx: defconfig update: Remove the museum NAND option
ARM: LPC32xx: defconfig update: Default drivers and cleanup
ARM: LPC32xx: defconfig update: gpio and keys
+ Linux 3.9-rc4
Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index fd70a68387eb..9b6d19f74078 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig | |||
| @@ -9,7 +9,6 @@ config ARM64 | |||
| 9 | select CLONE_BACKWARDS | 9 | select CLONE_BACKWARDS |
| 10 | select COMMON_CLK | 10 | select COMMON_CLK |
| 11 | select GENERIC_CLOCKEVENTS | 11 | select GENERIC_CLOCKEVENTS |
| 12 | select GENERIC_HARDIRQS_NO_DEPRECATED | ||
| 13 | select GENERIC_IOMAP | 12 | select GENERIC_IOMAP |
| 14 | select GENERIC_IRQ_PROBE | 13 | select GENERIC_IRQ_PROBE |
| 15 | select GENERIC_IRQ_SHOW | 14 | select GENERIC_IRQ_SHOW |