diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-24 22:09:35 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 22:09:35 (GMT) |
| commit | 5bdc22a56549e7983c6b443298672641952ea035 (patch) | |
| tree | fbfd4e7453e4fd23dfef826d4610ed2aae47b36c /arch/arm/configs/omap1_defconfig | |
| parent | b6f4098897f30b7ea90a1c1edf35e9b20a9d828a (diff) | |
| parent | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (diff) | |
| download | linux-fsl-qoriq-5bdc22a56549e7983c6b443298672641952ea035.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/sched/sch_hfsc.c
net/sched/sch_htb.c
net/sched/sch_tbf.c
Diffstat (limited to 'arch/arm/configs/omap1_defconfig')
| -rw-r--r-- | arch/arm/configs/omap1_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig index a350cc6..7b63462 100644 --- a/arch/arm/configs/omap1_defconfig +++ b/arch/arm/configs/omap1_defconfig @@ -6,7 +6,7 @@ CONFIG_BSD_PROCESS_ACCT=y CONFIG_IKCONFIG=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y -CONFIG_EMBEDDED=y +CONFIG_EXPERT=y # CONFIG_KALLSYMS is not set # CONFIG_ELF_CORE is not set # CONFIG_BASE_FULL is not set |