git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.37/misc' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
Kconfig
diff --git
a/arch/arm/mach-at91/Kconfig
b/arch/arm/mach-at91/Kconfig
index
ca33862
..
851e813
100644
(file)
--- a/
arch/arm/mach-at91/Kconfig
+++ b/
arch/arm/mach-at91/Kconfig
@@
-33,6
+33,7
@@
config ARCH_AT91SAM9260
select HAVE_AT91_USART3
select HAVE_AT91_USART4
select HAVE_AT91_USART5
select HAVE_AT91_USART3
select HAVE_AT91_USART4
select HAVE_AT91_USART5
+ select HAVE_NET_MACB
config ARCH_AT91SAM9261
bool "AT91SAM9261"
config ARCH_AT91SAM9261
bool "AT91SAM9261"
@@
-51,6
+52,7
@@
config ARCH_AT91SAM9263
select CPU_ARM926T
select GENERIC_CLOCKEVENTS
select HAVE_FB_ATMEL
select CPU_ARM926T
select GENERIC_CLOCKEVENTS
select HAVE_FB_ATMEL
+ select HAVE_NET_MACB
config ARCH_AT91SAM9RL
bool "AT91SAM9RL"
config ARCH_AT91SAM9RL
bool "AT91SAM9RL"
@@
-66,6
+68,7
@@
config ARCH_AT91SAM9G20
select HAVE_AT91_USART3
select HAVE_AT91_USART4
select HAVE_AT91_USART5
select HAVE_AT91_USART3
select HAVE_AT91_USART4
select HAVE_AT91_USART5
+ select HAVE_NET_MACB
config ARCH_AT91SAM9G45
bool "AT91SAM9G45"
config ARCH_AT91SAM9G45
bool "AT91SAM9G45"
@@
-73,6
+76,7
@@
config ARCH_AT91SAM9G45
select GENERIC_CLOCKEVENTS
select HAVE_AT91_USART3
select HAVE_FB_ATMEL
select GENERIC_CLOCKEVENTS
select HAVE_AT91_USART3
select HAVE_FB_ATMEL
+ select HAVE_NET_MACB
config ARCH_AT91CAP9
bool "AT91CAP9"
config ARCH_AT91CAP9
bool "AT91CAP9"
@@
-344,6
+348,7
@@
config MACH_AT91SAM9G20EK
that embeds only one SD/MMC slot.
config MACH_AT91SAM9G20EK_2MMC
that embeds only one SD/MMC slot.
config MACH_AT91SAM9G20EK_2MMC
+ depends on MACH_AT91SAM9G20EK
bool "Atmel AT91SAM9G20-EK Evaluation Kit with 2 SD/MMC Slots"
select HAVE_NAND_ATMEL_BUSWIDTH_16
help
bool "Atmel AT91SAM9G20-EK Evaluation Kit with 2 SD/MMC Slots"
select HAVE_NAND_ATMEL_BUSWIDTH_16
help
@@
-389,8
+394,8
@@
if ARCH_AT91SAM9G45
comment "AT91SAM9G45 Board Type"
comment "AT91SAM9G45 Board Type"
-config MACH_AT91SAM9
G45EKES
- bool "Atmel AT91SAM9
G45-EKES Evaluation Kit
"
+config MACH_AT91SAM9
M10G45EK
+ bool "Atmel AT91SAM9
M10G45-EK Evaluation Kits
"
select HAVE_NAND_ATMEL_BUSWIDTH_16
help
Select this if you are using Atmel's AT91SAM9G45-EKES Evaluation Kit.
select HAVE_NAND_ATMEL_BUSWIDTH_16
help
Select this if you are using Atmel's AT91SAM9G45-EKES Evaluation Kit.