[armel/orion5x, armel/kirkwood] Make sure VGA_CONSOLE is disabled,

otherwise the kernel won't boot.

svn path=/dists/sid/linux-2.6/; revision=14522
This commit is contained in:
Martin Michlmayr 2009-10-30 12:10:01 +00:00
parent 93d85d700e
commit 5d798cb23c
3 changed files with 12 additions and 0 deletions

2
debian/changelog vendored
View File

@ -1,6 +1,8 @@
linux-2.6 (2.6.31-2) UNRELEASED; urgency=low
[ Martin Michlmayr ]
* [armel/orion5x, armel/kirkwood] Make sure VGA_CONSOLE is disabled,
otherwise the kernel won't boot.
* [armel/kirkwood] Enable CRYPTO_DEV_MV_CESA (Closes: #552270).
* [armel/kirkwood, armel/orion5x] Enable ORION_WATCHDOG (the
name of the config variable changed).

View File

@ -531,6 +531,11 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
##
CONFIG_FB=m
##
## file: drivers/video/console/Kconfig
##
# CONFIG_VGA_CONSOLE is not set
##
## file: drivers/watchdog/Kconfig
##

View File

@ -511,6 +511,11 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
##
CONFIG_FB=m
##
## file: drivers/video/console/Kconfig
##
# CONFIG_VGA_CONSOLE is not set
##
## file: drivers/watchdog/Kconfig
##