diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 21:46:43 +0300 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 21:46:43 +0300 |
commit | c64eae9a73a847c1698f913c893aa4012d2a30b0 (patch) | |
tree | 732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /arch/powerpc/configs/85xx/sbc8560_defconfig | |
parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
download | linux-c64eae9a73a847c1698f913c893aa4012d2a30b0.tar.xz |
Merge commit 'v2.6.38-rc3' into devicetree/next
Diffstat (limited to 'arch/powerpc/configs/85xx/sbc8560_defconfig')
-rw-r--r-- | arch/powerpc/configs/85xx/sbc8560_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/85xx/sbc8560_defconfig b/arch/powerpc/configs/85xx/sbc8560_defconfig index 820e32d8c42b..f7fdb0318e4c 100644 --- a/arch/powerpc/configs/85xx/sbc8560_defconfig +++ b/arch/powerpc/configs/85xx/sbc8560_defconfig @@ -4,7 +4,7 @@ CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -CONFIG_EMBEDDED=y +CONFIG_EXPERT=y CONFIG_SLAB=y # CONFIG_BLK_DEV_BSG is not set CONFIG_SBC8560=y |