diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 14:15:50 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-04-07 14:15:50 -0400 |
| commit | 454abcc57f1d48a976291bc4af73b5f087e21d70 (patch) | |
| tree | 5bba999ea3f31527da02b60604531cc5fb52ea57 /arch/blackfin/configs/H8606_defconfig | |
| parent | 88aab9341a315d81118be6b41c45e4fe32b94bc1 (diff) | |
| parent | 6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff) | |
Merge commit 'v2.6.39-rc2' into spi/merge
Diffstat (limited to 'arch/blackfin/configs/H8606_defconfig')
| -rw-r--r-- | arch/blackfin/configs/H8606_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/configs/H8606_defconfig b/arch/blackfin/configs/H8606_defconfig index 7450127b6455..06e9f497faed 100644 --- a/arch/blackfin/configs/H8606_defconfig +++ b/arch/blackfin/configs/H8606_defconfig | |||
| @@ -45,6 +45,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y | |||
| 45 | CONFIG_MTD_M25P80=y | 45 | CONFIG_MTD_M25P80=y |
| 46 | # CONFIG_M25PXX_USE_FAST_READ is not set | 46 | # CONFIG_M25PXX_USE_FAST_READ is not set |
| 47 | CONFIG_BLK_DEV_RAM=y | 47 | CONFIG_BLK_DEV_RAM=y |
| 48 | CONFIG_MISC_DEVICES=y | ||
| 48 | CONFIG_EEPROM_AT25=y | 49 | CONFIG_EEPROM_AT25=y |
| 49 | CONFIG_NETDEVICES=y | 50 | CONFIG_NETDEVICES=y |
| 50 | CONFIG_NET_ETHERNET=y | 51 | CONFIG_NET_ETHERNET=y |