From ce25a8286e966f3ee8002acb48ed2c4ab3386a56 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 Jun 2007 14:05:22 +0000 Subject: [PATCH] * CONFIG_FB_TILEBLITTING has to be off, otherwise CONFIG_FB_SPLASH will be disabled (and CONFIG_FB_S3 implies CONFIG_FB_TILEBLITTING). svn path=/nixpkgs/trunk/; revision=8826 --- pkgs/os-specific/linux/kernel/config-2.6.21-i686-smp | 4 ++-- pkgs/os-specific/linux/kernel/config-2.6.21-x86_64-smp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/config-2.6.21-i686-smp b/pkgs/os-specific/linux/kernel/config-2.6.21-i686-smp index 05aed410ff6..41266d0d951 100644 --- a/pkgs/os-specific/linux/kernel/config-2.6.21-i686-smp +++ b/pkgs/os-specific/linux/kernel/config-2.6.21-i686-smp @@ -2786,7 +2786,7 @@ CONFIG_FB_SVGALIB=m # 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 @@ -2828,7 +2828,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 diff --git a/pkgs/os-specific/linux/kernel/config-2.6.21-x86_64-smp b/pkgs/os-specific/linux/kernel/config-2.6.21-x86_64-smp index 81ac04540e0..d1f6046879d 100644 --- a/pkgs/os-specific/linux/kernel/config-2.6.21-x86_64-smp +++ b/pkgs/os-specific/linux/kernel/config-2.6.21-x86_64-smp @@ -2511,7 +2511,7 @@ CONFIG_FB_SVGALIB=m # 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 @@ -2549,7 +2549,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