projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memor...
[linux-2.6-block.git]
/
arch
/
x86
/
configs
/
i386_defconfig
diff --git
a/arch/x86/configs/i386_defconfig
b/arch/x86/configs/i386_defconfig
index ef9a52005ec9f726dbf018d43021fd1b3bf3edf8..ca226ca31288254bd40eb45ba55047c04b01bb09 100644
(file)
--- a/
arch/x86/configs/i386_defconfig
+++ b/
arch/x86/configs/i386_defconfig
@@
-1535,7
+1535,6
@@
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_VGA_CONSOLE=y
CONFIG_VGACON_SOFT_SCROLLBACK=y
CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
-CONFIG_VIDEO_SELECT=y
CONFIG_DUMMY_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE is not set
CONFIG_LOGO=y