Linux 3.2-rc2-git3 (upstream 15bd1cfb3055)

Disable various fb and drm drivers that don't have xorg equivalents per ajax
Other minor config cleanup

1 files changed, 38 insertions, 66 deletions

diff --git a/config-generic b/config-generic
index 341c2834c..c187aaf8e 100644
--- a/config-generic
+++ b/config-generic
@@ -2388,25 +2388,7 @@ CONFIG_SENSORS_MAX1668=m
 # CONFIG_SERIAL_PCH_UART is not set
 # CONFIG_USB_SWITCH_FSA9480 is not set
 
-CONFIG_W1=m
-CONFIG_W1_CON=y
-# This is busted.
-# If we enable it, it steals Matrox cards, and the
-# framebuffer drivers stop working.
-# CONFIG_W1_MASTER_MATROX is not set
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS1WM=m
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-CONFIG_W1_SLAVE_DS2433_CRC=y
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_DS2423=m
-CONFIG_W1_SLAVE_DS2408=m
-CONFIG_W1_SLAVE_DS2780=m
-CONFIG_W1_SLAVE_BQ27000=m
+# CONFIG_W1 is not set
 
 #
 # Mice
@@ -2541,12 +2523,12 @@ CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_KMS=y
 CONFIG_DRM_I810=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_SAVAGE=m
+# CONFIG_DRM_MGA is not set
+# CONFIG_DRM_SIS is not set
+# CONFIG_DRM_SAVAGE is not set
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_VIA=m
+# CONFIG_DRM_VIA is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU_DEBUG=y
@@ -2889,19 +2871,16 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m
 
 CONFIG_FB=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_3DFX_I2C=y
+# CONFIG_FB_3DFX is not set
 # CONFIG_FB_ARC is not set
 # CONFIG_FB_ARK is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_GENERIC_LCD=y
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_ATY_CT is not set
+# CONFIG_FB_ATY_GX is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_CARMINE is not set
-CONFIG_FB_CIRRUS=m
+# CONFIG_FB_CIRRUS is not set
 # CONFIG_FB_CYBER2000 is not set
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_HECUBA is not set
@@ -2913,40 +2892,34 @@ CONFIG_FB_I810_I2C=y
 # CONFIG_FB_INTEL is not set
 # CONFIG_FB_INTEL_DEBUG is not set
 # CONFIG_FB_INTEL_I2C is not set
-CONFIG_FB_KYRO=m
+# CONFIG_FB_KYRO is not set
 # CONFIG_FB_LE80578 is not set
-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_NEOMAGIC=m
-CONFIG_FB_NVIDIA=m
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_MATROX_MILLENIUM is not set
+# CONFIG_FB_MATROX_MYSTIQUE is not set
+# CONFIG_FB_MATROX_G is not set
+# CONFIG_FB_MATROX_I2C is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_NVIDIA_I2C is not set
 # CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_I2C=y
 # CONFIG_FB_PM2 is not set
 # CONFIG_FB_PM2_FIFO_DISCONNECT is not set
 # CONFIG_FB_PM3 is not set
-CONFIG_FB_RADEON=m
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_RADEON_I2C is not set
 # CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RIVA=m
+# CONFIG_FB_RIVA is not set
 # CONFIG_FB_RIVA_DEBUG is not set
 # CONFIG_FB_RIVA_I2C is not set
 # CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_S3=m
-CONFIG_FB_S3_DDC=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
 # CONFIG_FB_SIS is not set
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_SM501=m
-CONFIG_FB_SMSCUFX=m
+# CONFIG_FB_SM501 is not set
+# CONFIG_FB_SMSCUFX is not set
 CONFIG_FB_TILEBLITTING=y
-CONFIG_FB_TRIDENT=m
+# CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_UVESA is not set
 CONFIG_FB_VESA=y
 CONFIG_FB_VGA16=m
@@ -2954,10 +2927,9 @@ CONFIG_FB_VIRTUAL=m
 CONFIG_FB_VOODOO1=m
 # CONFIG_FB_VT8623 is not set
 CONFIG_FB_EFI=y
-CONFIG_FB_VIA=m
-CONFIG_FB_VIA_X_COMPATIBILITY=y
+# CONFIG_FB_VIA is not set
 # CONFIG_FB_VIA_DIRECT_PROCFS is not set
-CONFIG_FB_METRONOME=m
+# CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_PRE_INIT_FB is not set
 # CONFIG_FB_TMIO is not set
@@ -3626,10 +3598,10 @@ CONFIG_DNOTIFY=y
 # Autofsv3 is obsolete.
 # systemd is dependant upon AUTOFS, so build it in.
 CONFIG_AUTOFS4_FS=y
-CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_FS is not set
 # CONFIG_EXOFS_DEBUG is not set
-CONFIG_NILFS2_FS=m
-CONFIG_LOGFS=m
+# CONFIG_NILFS2_FS is not set
+# CONFIG_LOGFS is not set
 CONFIG_CEPH_FS=m
 CONFIG_BLK_DEV_RBD=m
 CONFIG_CEPH_LIB=m
@@ -3686,8 +3658,8 @@ CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m
 # CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EFS_FS=m
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
 CONFIG_JFFS2_FS=m
 CONFIG_JFFS2_FS_DEBUG=0
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
@@ -3705,9 +3677,9 @@ CONFIG_SQUASHFS_XZ=y
 CONFIG_SQUASHFS_ZLIB=y
 # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
 # CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_VXFS_FS=m
+# CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
-CONFIG_QNX4FS_FS=m
+# CONFIG_QNX4FS_FS is not set
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
@@ -3716,7 +3688,7 @@ CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_FUSE_FS=m
-CONFIG_OMFS_FS=m
+# CONFIG_OMFS_FS is not set
 CONFIG_CUSE=m
 
 #