summaryrefslogtreecommitdiffstats
path: root/abs/core/kernel26/config
diff options
context:
space:
mode:
authorJames Meyer <jams@linhes.org>2011-01-05 16:00:10 (GMT)
committerJames Meyer <jams@linhes.org>2011-01-05 16:00:10 (GMT)
commitc50c191b426d92cfdfb43c4e3f15f942760f0931 (patch)
tree56a01a0a3a7a1d066b26c0db44d108e62b64aaa7 /abs/core/kernel26/config
parent11e85b2f03ba217fe01d17763bb6832c536d768a (diff)
parent7c860c250fff97bb77088a70dc53478a44a24f05 (diff)
downloadlinhes_pkgbuild-c50c191b426d92cfdfb43c4e3f15f942760f0931.zip
linhes_pkgbuild-c50c191b426d92cfdfb43c4e3f15f942760f0931.tar.gz
linhes_pkgbuild-c50c191b426d92cfdfb43c4e3f15f942760f0931.tar.bz2
Merge remote branch 'origin/testing' into testing
Diffstat (limited to 'abs/core/kernel26/config')
-rw-r--r--abs/core/kernel26/config14
1 files changed, 6 insertions, 8 deletions
diff --git a/abs/core/kernel26/config b/abs/core/kernel26/config
index dfbf378..3f27252 100644
--- a/abs/core/kernel26/config
+++ b/abs/core/kernel26/config
@@ -3563,11 +3563,11 @@ CONFIG_FB_SYS_IMAGEBLIT=m
# CONFIG_FB_FOREIGN_ENDIAN is not set
CONFIG_FB_SYS_FOPS=m
CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_SVGALIB=m
+# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
CONFIG_FB_BACKLIGHT=y
CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
+# CONFIG_FB_TILEBLITTING is not set
#
# Frame buffer hardware drivers
@@ -3610,7 +3610,7 @@ CONFIG_FB_ATY_CT=y
CONFIG_FB_ATY_GENERIC_LCD=y
CONFIG_FB_ATY_GX=y
CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
+# CONFIG_FB_S3 is not set
CONFIG_FB_SAVAGE=m
CONFIG_FB_SAVAGE_I2C=y
CONFIG_FB_SAVAGE_ACCEL=y
@@ -3625,7 +3625,7 @@ CONFIG_FB_3DFX=m
CONFIG_FB_3DFX_ACCEL=y
CONFIG_FB_3DFX_I2C=y
CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
+# CONFIG_FB_VT8623 is not set
CONFIG_FB_TRIDENT=m
# CONFIG_FB_ARK is not set
# CONFIG_FB_PM3 is not set
@@ -3675,6 +3675,7 @@ CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FB_CON_DECOR=y
CONFIG_FONTS=y
# CONFIG_FONT_8x8 is not set
CONFIG_FONT_8x16=y
@@ -3686,10 +3687,7 @@ CONFIG_FONT_8x16=y
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set