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-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[pandora-kernel.git]
/
arch
/
blackfin
/
configs
/
SRV1_defconfig
diff --git
a/arch/blackfin/configs/SRV1_defconfig
b/arch/blackfin/configs/SRV1_defconfig
index
8538095
..
12e66cd
100644
(file)
--- a/
arch/blackfin/configs/SRV1_defconfig
+++ b/
arch/blackfin/configs/SRV1_defconfig
@@
-48,6
+48,7
@@
CONFIG_MTD_COMPLEX_MAPPINGS=y
CONFIG_MTD_UCLINUX=y
CONFIG_MTD_NAND=m
CONFIG_BLK_DEV_RAM=y
+CONFIG_MISC_DEVICES=y
CONFIG_EEPROM_AT25=m
CONFIG_NETDEVICES=y
# CONFIG_NETDEV_1000 is not set