diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-25 19:38:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-25 19:38:52 +0200 |
| commit | 7d7a48b76012eeee25871e1d69104dec4b6d740f (patch) | |
| tree | c27e3d8bb2e80ad93c7b4a5c850e1ffbc090bcd2 /arch/avr32/Kconfig | |
| parent | x86, printk: Get rid of <0> from stack output (diff) | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko... (diff) | |
| download | linux-7d7a48b76012eeee25871e1d69104dec4b6d740f.tar.xz linux-7d7a48b76012eeee25871e1d69104dec4b6d740f.zip | |
Merge branch 'linus' into x86/urgent
Merge reason: We want to queue up a dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/avr32/Kconfig')
| -rw-r--r-- | arch/avr32/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index f51572772e21..f0dc5b8075a7 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig @@ -90,6 +90,7 @@ config PLATFORM_AT32AP select ARCH_REQUIRE_GPIOLIB select GENERIC_ALLOCATOR select HAVE_FB_ATMEL + select HAVE_NET_MACB # # CPU types @@ -145,7 +146,7 @@ config BOARD_HAMMERHEAD will cover even the most exceptional need of memory bandwidth. Together with the onboard video decoder the board is ready for video processing. - For more information see: http://www.miromico.com/hammerhead + For more information see: http://www.miromico.ch/index.php/hammerhead.html config BOARD_FAVR_32 bool "Favr-32 LCD-board" |