diff options
| author | tnut <tnut at nutyx dot com> | 2011-07-03 11:29:57 +0200 |
|---|---|---|
| committer | tnut <tnut at nutyx dot com> | 2011-07-03 11:29:57 +0200 |
| commit | 9c623f28bf6bfcfdd85b0a708d0e92bfcb97ce55 (patch) | |
| tree | 3d092a540c65eeb4e2943be959cadac1e75b5fc3 /base | |
| parent | 083af5eb89d16f9c1686af1d4e7dcb8bbcef571e (diff) | |
| parent | 02ac6c625ee14e209cc2f91a1e5b1a305cfbfcb4 (diff) | |
| download | nutyx-extra-9c623f28bf6bfcfdd85b0a708d0e92bfcb97ce55.tar.gz nutyx-extra-9c623f28bf6bfcfdd85b0a708d0e92bfcb97ce55.tar.bz2 nutyx-extra-9c623f28bf6bfcfdd85b0a708d0e92bfcb97ce55.tar.xz nutyx-extra-9c623f28bf6bfcfdd85b0a708d0e92bfcb97ce55.zip | |
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe
Diffstat (limited to 'base')
| -rw-r--r-- | base/kernel/config | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/base/kernel/config b/base/kernel/config index eb30c2283..68d278cf2 100644 --- a/base/kernel/config +++ b/base/kernel/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/i386 2.6.39 Kernel Configuration -# Fri Jun 24 21:48:52 2011 +# Sat Jul 2 23:17:22 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3760,7 +3760,7 @@ CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y -# CONFIG_DRM_I810 is not set +CONFIG_DRM_I810=m CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y CONFIG_DRM_MGA=m @@ -3817,27 +3817,23 @@ CONFIG_FB_RIVA=m CONFIG_FB_RIVA_I2C=y # CONFIG_FB_RIVA_DEBUG is not set CONFIG_FB_RIVA_BACKLIGHT=y -# CONFIG_FB_I810 is not set +CONFIG_FB_I810=m +CONFIG_FB_I810_GTF=y +CONFIG_FB_I810_I2C=y CONFIG_FB_LE80578=m CONFIG_FB_CARILLO_RANCH=m -# CONFIG_FB_INTEL is not set +CONFIG_FB_INTEL=m +# CONFIG_FB_INTEL_DEBUG is not set +CONFIG_FB_INTEL_I2C=y CONFIG_FB_MATROX=m CONFIG_FB_MATROX_MILLENIUM=y CONFIG_FB_MATROX_MYSTIQUE=y CONFIG_FB_MATROX_G=y CONFIG_FB_MATROX_I2C=m CONFIG_FB_MATROX_MAVEN=m -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -CONFIG_FB_RADEON_BACKLIGHT=y -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_ATY128=m -CONFIG_FB_ATY128_BACKLIGHT=y -CONFIG_FB_ATY=m -CONFIG_FB_ATY_CT=y -CONFIG_FB_ATY_GENERIC_LCD=y -CONFIG_FB_ATY_GX=y -CONFIG_FB_ATY_BACKLIGHT=y +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set CONFIG_FB_S3=m CONFIG_FB_SAVAGE=m CONFIG_FB_SAVAGE_I2C=y |