diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-06 08:11:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-06 08:11:28 +0200 |
| commit | 4d70230bb46859df6295744f7dcf8c560f01fb8f (patch) | |
| tree | a5b0f219c2f90365136a00b555fdd4fcc07ed3bf /arch/arm/mach-at91/Kconfig | |
| parent | 98bb318864ed10ae374573f1382147f113642059 (diff) | |
| parent | bfd412db9e7b0d8f7b9c09d12d07aa2ac785f1d0 (diff) | |
| download | linux-4d70230bb46859df6295744f7dcf8c560f01fb8f.tar.gz linux-4d70230bb46859df6295744f7dcf8c560f01fb8f.tar.bz2 linux-4d70230bb46859df6295744f7dcf8c560f01fb8f.zip | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into perf/urgent
Diffstat (limited to 'arch/arm/mach-at91/Kconfig')
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 19390231a0e9..2d299bf5d72f 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -83,6 +83,7 @@ config ARCH_AT91CAP9 select CPU_ARM926T select GENERIC_CLOCKEVENTS select HAVE_FB_ATMEL + select HAVE_NET_MACB config ARCH_AT572D940HF bool "AT572D940HF" |