diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-30 07:51:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-30 07:51:29 -0700 |
| commit | a8a44921383039bd5387020d035123d21660b309 (patch) | |
| tree | 762260c85b584f48c74d70f0e1fe03c930c2898e /arch/blackfin/configs/SRV1_defconfig | |
| parent | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | Blackfin: bitops: fix include order after little endian inclusion (diff) | |
| download | linux-dev-a8a44921383039bd5387020d035123d21660b309.tar.xz linux-dev-a8a44921383039bd5387020d035123d21660b309.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
Blackfin: bitops: fix include order after little endian inclusion
Blackfin: defconfigs: update after misc devices defaulted to N
Blackfin: use more standard pr_fmt in the module loader
Diffstat (limited to 'arch/blackfin/configs/SRV1_defconfig')
| -rw-r--r-- | arch/blackfin/configs/SRV1_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/configs/SRV1_defconfig b/arch/blackfin/configs/SRV1_defconfig index 853809510ee9..12e66cd7cdaa 100644 --- 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 |