git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.27-rc8' into x86/setup
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
configs
/
i386_defconfig
diff --git
a/arch/x86/configs/i386_defconfig
b/arch/x86/configs/i386_defconfig
index 104275e191a8edc97d2de46c390c011f85206c8a..8cc9eea839e4d485682e9ee9539edfeb9ce60041 100644
(file)
--- a/
arch/x86/configs/i386_defconfig
+++ b/
arch/x86/configs/i386_defconfig
@@
-1532,7
+1532,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