diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-22 12:24:26 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-22 12:41:48 -0500 |
| commit | 695884fb8acd9857e0e7120ccb2150e30f4b8fef (patch) | |
| tree | 49aa424c1a021ce432e9fa5ea29d37a23e4e30cc /arch/m68knommu/defconfig | |
| parent | 5df91509d324d44cfb11e55d9cb02fe18b53b045 (diff) | |
| parent | 04bea68b2f0eeebb089ecc67b618795925268b4a (diff) | |
Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86/platform
Reason: x86 devicetree support for ce4100 depends on those device tree
changes scheduled for .39.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/m68knommu/defconfig')
| -rw-r--r-- | arch/m68knommu/defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68knommu/defconfig b/arch/m68knommu/defconfig index 6ac2981a2cdf..2f5655c577af 100644 --- a/arch/m68knommu/defconfig +++ b/arch/m68knommu/defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | CONFIG_EXPERIMENTAL=y | 1 | CONFIG_EXPERIMENTAL=y |
| 2 | CONFIG_LOG_BUF_SHIFT=14 | 2 | CONFIG_LOG_BUF_SHIFT=14 |
| 3 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 3 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 4 | CONFIG_EMBEDDED=y | 4 | CONFIG_EXPERT=y |
| 5 | # CONFIG_KALLSYMS is not set | 5 | # CONFIG_KALLSYMS is not set |
| 6 | # CONFIG_HOTPLUG is not set | 6 | # CONFIG_HOTPLUG is not set |
| 7 | # CONFIG_FUTEX is not set | 7 | # CONFIG_FUTEX is not set |