From 43d561eab3837cfca0e4aa90e7a0c6c24e0c5e66 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 8 Jul 2012 14:33:48 +0200
Subject: [PATCH] kernel: disable builtin fb opts now that we have KMS drvs in
 the initramfs by default.

---
 srcpkgs/kernel/files/i386-dotconfig   | 26 +++++++++++++-------------
 srcpkgs/kernel/files/x86_64-dotconfig | 22 +++++++++++-----------
 srcpkgs/kernel/template               |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/kernel/files/i386-dotconfig b/srcpkgs/kernel/files/i386-dotconfig
index 540dd68fdfa..e3cc84773ad 100644
--- a/srcpkgs/kernel/files/i386-dotconfig
+++ b/srcpkgs/kernel/files/i386-dotconfig
@@ -93,7 +93,7 @@ CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_GENERIC_IRQ_CHIP=y
-CONFIG_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN is not set
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_SPARSE_IRQ=y
@@ -2660,7 +2660,7 @@ CONFIG_TCG_INFINEON=m
 CONFIG_TELCLOCK=m
 CONFIG_DEVPORT=y
 CONFIG_RAMOOPS=m
-CONFIG_I2C=y
+CONFIG_I2C=m
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
@@ -3868,15 +3868,15 @@ CONFIG_DRM_GMA600=y
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_UDL=m
 CONFIG_STUB_POULSBO=m
-CONFIG_VGASTATE=y
+CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_FB=y
+CONFIG_FB=m
 CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DDC=y
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_DDC=m
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=m
+CONFIG_FB_CFB_COPYAREA=m
+CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_COPYAREA=m
@@ -3904,12 +3904,12 @@ CONFIG_FB_CYBER2000_DDC=y
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_UVESA=m
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
+# CONFIG_FB_VESA is not set
+# CONFIG_FB_EFI is not set
 # CONFIG_FB_N411 is not set
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_NVIDIA=y
+CONFIG_FB_NVIDIA=m
 CONFIG_FB_NVIDIA_I2C=y
 # CONFIG_FB_NVIDIA_DEBUG is not set
 CONFIG_FB_NVIDIA_BACKLIGHT=y
@@ -5112,7 +5112,7 @@ CONFIG_DEVFREQ_GOV_USERSPACE=y
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=y
+CONFIG_EFI_VARS=m
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
diff --git a/srcpkgs/kernel/files/x86_64-dotconfig b/srcpkgs/kernel/files/x86_64-dotconfig
index 1b31a51a319..bd1cacf6206 100644
--- a/srcpkgs/kernel/files/x86_64-dotconfig
+++ b/srcpkgs/kernel/files/x86_64-dotconfig
@@ -3762,17 +3762,17 @@ CONFIG_DRM_UDL=m
 CONFIG_STUB_POULSBO=m
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_FB=y
+CONFIG_FB=m
 CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DDC=y
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_DDC=m
+# CONFIG_FB_BOOT_VESA_SUPPORT is not set
+CONFIG_FB_CFB_FILLRECT=m
+CONFIG_FB_CFB_COPYAREA=m
+CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=y
-CONFIG_FB_SYS_COPYAREA=y
-CONFIG_FB_SYS_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
 # CONFIG_FB_WMT_GE_ROPS is not set
@@ -3796,8 +3796,8 @@ CONFIG_FB_CYBER2000_DDC=y
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_VGA16 is not set
 CONFIG_FB_UVESA=m
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
+# CONFIG_FB_VESA is not set
+# CONFIG_FB_EFI is not set
 # CONFIG_FB_N411 is not set
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_S1D13XXX is not set
diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index 31aee6bf8a7..1868160f646 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -3,7 +3,7 @@
 pkgname=kernel
 _kmajorver=3.4
 version=${_kmajorver}.4
-revision=4
+revision=5
 nostrip=yes
 noverifyrdeps=yes
 preserve=yes