diff options
| author | tnut <tnut at nutyx dot com> | 2011-07-03 00:22:43 +0200 |
|---|---|---|
| committer | tnut <tnut at nutyx dot com> | 2011-07-03 00:22:43 +0200 |
| commit | 9e216668a665cc2279be249bc4bd448c8a851b4d (patch) | |
| tree | 7d4b7e8f2859b7282b01dfd743ed9eed7cd57c05 /base/kernel/config_64 | |
| parent | 41d294a6fd452b1575125ae06b453758f32ddf5a (diff) | |
| parent | f8b0734b19b1c6fb0a781b930b79e63b43ee6044 (diff) | |
| download | nutyx-extra-9e216668a665cc2279be249bc4bd448c8a851b4d.tar.gz nutyx-extra-9e216668a665cc2279be249bc4bd448c8a851b4d.tar.bz2 nutyx-extra-9e216668a665cc2279be249bc4bd448c8a851b4d.tar.xz nutyx-extra-9e216668a665cc2279be249bc4bd448c8a851b4d.zip | |
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe
Diffstat (limited to 'base/kernel/config_64')
| -rw-r--r-- | base/kernel/config_64 | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/base/kernel/config_64 b/base/kernel/config_64 index 2cebd56ff..be246ffde 100644 --- a/base/kernel/config_64 +++ b/base/kernel/config_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/x86_64 2.6.39 Kernel Configuration -# Fri Jun 24 21:48:40 2011 +# Sat Jul 2 17:43:10 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -3721,7 +3721,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 @@ -3770,14 +3770,8 @@ CONFIG_FB_VESA=y CONFIG_FB_N411=m CONFIG_FB_HGA=m CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -CONFIG_FB_RIVA=m -CONFIG_FB_RIVA_I2C=y -# CONFIG_FB_RIVA_DEBUG is not set -CONFIG_FB_RIVA_BACKLIGHT=y +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set CONFIG_FB_LE80578=m CONFIG_FB_CARILLO_RANCH=m # CONFIG_FB_INTEL is not set @@ -3787,17 +3781,9 @@ 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 |