diff --git a/[refs] b/[refs] index 5894934c7fe5..938ece3fbd16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03b9ae4b80dd5b20d7bf7e15902592d50c66780d +refs/heads/master: 11fe250d89cdce3d6bb43bd674f3dcdcaa78dbc8 diff --git a/trunk/drivers/video/console/Kconfig b/trunk/drivers/video/console/Kconfig index aa3935df852a..63b85bf81a65 100644 --- a/trunk/drivers/video/console/Kconfig +++ b/trunk/drivers/video/console/Kconfig @@ -19,13 +19,6 @@ config VGA_CONSOLE Say Y. -# if [ "$CONFIG_PCI" = "y" -a "$CONFIG_VGA_CONSOLE" = "y" ]; then -# bool ' Allow VGA on any bus?' CONFIG_VGA_HOSE -# if [ "$CONFIG_VGA_HOSE" = "y" ]; then -# define_bool CONFIG_DUMMY_CONSOLE y -# fi -# fi - config VGACON_SOFT_SCROLLBACK bool "Enable Scrollback Buffer in System RAM" depends on VGA_CONSOLE