Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-12-03 15:41:46 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-03 15:41:46 -0800
commit4070eecb55553914dd7cf49aeb8a589df281e7d9 (patch)
tree325151b36e5c3a48819f49dcd95068a310d6fbb1
parentbe066137c8f49fa2c2c3eeb813d722da9b5430f7 (diff)
- Update config files.rpm-2.6.32-3
CONFIG_DRM_I915_KMS=y for x86-64 and i386 vanilla (bnc#560402)
-rw-r--r--config/i386/vanilla3
-rw-r--r--config/ia64/vanilla2
-rw-r--r--config/ppc/vanilla2
-rw-r--r--config/ppc64/vanilla2
-rw-r--r--config/s390x/vanilla2
-rw-r--r--config/x86_64/vanilla3
-rw-r--r--kernel-source.changes6
7 files changed, 14 insertions, 6 deletions
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 48a52a5ed8..0428ea197e 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -3492,6 +3492,7 @@ CONFIG_DRM_RADEON=m
CONFIG_DRM_I810=m
CONFIG_DRM_I830=m
CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
@@ -4497,7 +4498,7 @@ CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_RT=y
# CONFIG_XFS_DEBUG is not set
CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=n
+# CONFIG_GFS2_FS_LOCKING_DLM is not set
CONFIG_OCFS2_FS=m
CONFIG_OCFS2_FS_O2CB=m
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
diff --git a/config/ia64/vanilla b/config/ia64/vanilla
index 402e67fca5..24a2e42e6a 100644
--- a/config/ia64/vanilla
+++ b/config/ia64/vanilla
@@ -3613,7 +3613,7 @@ CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_RT=y
# CONFIG_XFS_DEBUG is not set
CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=n
+# CONFIG_GFS2_FS_LOCKING_DLM is not set
CONFIG_OCFS2_FS=m
CONFIG_OCFS2_FS_O2CB=m
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
diff --git a/config/ppc/vanilla b/config/ppc/vanilla
index 7c4db583bb..d188dc6e87 100644
--- a/config/ppc/vanilla
+++ b/config/ppc/vanilla
@@ -3481,7 +3481,7 @@ CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_RT=y
# CONFIG_XFS_DEBUG is not set
CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=n
+# CONFIG_GFS2_FS_LOCKING_DLM is not set
CONFIG_OCFS2_FS=m
CONFIG_OCFS2_FS_O2CB=m
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index dc548b6afc..0a6ab62fe3 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -3369,7 +3369,7 @@ CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_RT=y
# CONFIG_XFS_DEBUG is not set
CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=n
+# CONFIG_GFS2_FS_LOCKING_DLM is not set
CONFIG_OCFS2_FS=m
CONFIG_OCFS2_FS_O2CB=m
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
diff --git a/config/s390x/vanilla b/config/s390x/vanilla
index b35a0a844e..424ec94e63 100644
--- a/config/s390x/vanilla
+++ b/config/s390x/vanilla
@@ -1054,7 +1054,7 @@ CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_RT=y
# CONFIG_XFS_DEBUG is not set
CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=n
+# CONFIG_GFS2_FS_LOCKING_DLM is not set
CONFIG_OCFS2_FS=m
CONFIG_OCFS2_FS_O2CB=m
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index fc457bdebf..0a9475c331 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -3305,6 +3305,7 @@ CONFIG_DRM_RADEON=m
CONFIG_DRM_I810=m
CONFIG_DRM_I830=m
CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
@@ -4261,7 +4262,7 @@ CONFIG_XFS_POSIX_ACL=y
CONFIG_XFS_RT=y
# CONFIG_XFS_DEBUG is not set
CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=n
+# CONFIG_GFS2_FS_LOCKING_DLM is not set
CONFIG_OCFS2_FS=m
CONFIG_OCFS2_FS_O2CB=m
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
diff --git a/kernel-source.changes b/kernel-source.changes
index a6ba97db13..b73f36d69e 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Dec 4 00:41:32 CET 2009 - gregkh@suse.de
+
+- Update config files.
+ CONFIG_DRM_I915_KMS=y for x86-64 and i386 vanilla (bnc#560402)
+
+-------------------------------------------------------------------
Fri Dec 4 00:17:46 CET 2009 - gregkh@suse.de
- Update config files.