diff options
| author | David S. Miller <davem@davemloft.net> | 2013-05-24 19:48:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-24 19:48:28 -0400 |
| commit | e6ff4c75f9095f61b3a66c2a78e47b62864022dd (patch) | |
| tree | 425ea9463cbec0b1975b8a33d9a56817143055d0 /arch/arm/Kconfig | |
| parent | ee9c799c231324de681eb21e06d8bf4842768b75 (diff) | |
| parent | 0e255f1c0c9add2f0c920240ac4cadc28ae274c3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next because some upcoming net-next changes
build on top of bug fixes that went into net.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d423d58f938d..49d993cee512 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -38,6 +38,7 @@ config ARM | |||
| 38 | select HAVE_GENERIC_HARDIRQS | 38 | select HAVE_GENERIC_HARDIRQS |
| 39 | select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)) | 39 | select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)) |
| 40 | select HAVE_IDE if PCI || ISA || PCMCIA | 40 | select HAVE_IDE if PCI || ISA || PCMCIA |
| 41 | select HAVE_IRQ_TIME_ACCOUNTING | ||
| 41 | select HAVE_KERNEL_GZIP | 42 | select HAVE_KERNEL_GZIP |
| 42 | select HAVE_KERNEL_LZMA | 43 | select HAVE_KERNEL_LZMA |
| 43 | select HAVE_KERNEL_LZO | 44 | select HAVE_KERNEL_LZO |
| @@ -488,7 +489,7 @@ config ARCH_IXP4XX | |||
| 488 | config ARCH_DOVE | 489 | config ARCH_DOVE |
| 489 | bool "Marvell Dove" | 490 | bool "Marvell Dove" |
| 490 | select ARCH_REQUIRE_GPIOLIB | 491 | select ARCH_REQUIRE_GPIOLIB |
| 491 | select CPU_V7 | 492 | select CPU_PJ4 |
| 492 | select GENERIC_CLOCKEVENTS | 493 | select GENERIC_CLOCKEVENTS |
| 493 | select MIGHT_HAVE_PCI | 494 | select MIGHT_HAVE_PCI |
| 494 | select PINCTRL | 495 | select PINCTRL |