diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-01-30 13:25:14 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-01-30 13:25:14 +0100 |
| commit | c74e1d46b68f67f059050263ebb434a3d7344657 (patch) | |
| tree | 0e913a2f32296da798ba6cd4a9f3dcea26da43c4 /packages/linux/linux-2.6.28/at91sam9263ek | |
| parent | 2466a29b608e4725de8e71e4c38618b0b9bfe088 (diff) | |
| parent | c49f410e88a5828c198ebbe3f781bc9e5ab1a347 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/linux/linux-2.6.28/at91sam9263ek')
| -rw-r--r-- | packages/linux/linux-2.6.28/at91sam9263ek/defconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/packages/linux/linux-2.6.28/at91sam9263ek/defconfig b/packages/linux/linux-2.6.28/at91sam9263ek/defconfig index d4355e8625..72a8bb8e21 100644 --- a/packages/linux/linux-2.6.28/at91sam9263ek/defconfig +++ b/packages/linux/linux-2.6.28/at91sam9263ek/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28 -# Thu Jan 22 13:17:54 2009 +# Wed Jan 28 15:11:30 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -404,8 +404,6 @@ CONFIG_BT_HCIBTSDIO=m # CONFIG_AF_RXRPC is not set # CONFIG_PHONET is not set # CONFIG_WIRELESS is not set -# CONFIG_MAC80211_RC_DEFAULT_PID is not set -# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set @@ -613,7 +611,7 @@ CONFIG_DAVICOM_PHY=y CONFIG_NET_ETHERNET=y CONFIG_MII=y CONFIG_MACB=y -# CONFIG_MACB_TX_SRAM is not set +CONFIG_MACB_TX_SRAM=y # CONFIG_AX88796 is not set # CONFIG_SMC91X is not set # CONFIG_DM9000 is not set |