summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-powerpc-generic5
-rw-r--r--config-s390x9
-rw-r--r--config-sparc64-generic6
-rw-r--r--config-x86-32-generic8
-rw-r--r--kernel.spec3
5 files changed, 31 insertions, 0 deletions
diff --git a/config-powerpc-generic b/config-powerpc-generic
index a6ef1c4df..3923eff84 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -380,3 +380,8 @@ CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RTC_DRV_SNVS is not set
# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_FB_SSD1307=m
+CONFIG_INPUT_PWM_BEEPER=m
+CONFIG_BACKLIGHT_PWM=m
+CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=n
diff --git a/config-s390x b/config-s390x
index 41e41c53c..c1a616f77 100644
--- a/config-s390x
+++ b/config-s390x
@@ -250,3 +250,12 @@ CONFIG_BPF_JIT=y
# CONFIG_SCM_BLOCK_CLUSTER_WRITE is not set
# CONFIG_S390_PTDUMP is not set
# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+CONFIG_PCI_NR_FUNCTIONS=64
+CONFIG_HOTPLUG_PCI=m
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_SHPC is not set
+CONFIG_HOTPLUG_PCI_S390=m
+# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_MCP23S08 is not set
diff --git a/config-sparc64-generic b/config-sparc64-generic
index e15e2ef18..30c3c9b5a 100644
--- a/config-sparc64-generic
+++ b/config-sparc64-generic
@@ -215,3 +215,9 @@ CONFIG_BPF_JIT=y
# CONFIG_CRYPTO_DES_SPARC64 is not set
# CONFIG_ASYMMETRIC_KEY_TYPE is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_POWER_RESET_GPIO is not set
+# CONFIG_FB_SSD1307 is not set
diff --git a/config-x86-32-generic b/config-x86-32-generic
index 1216d47e6..65d68f8dc 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -53,6 +53,8 @@ CONFIG_FB_GEODE_LX=y
CONFIG_FB_GEODE_GX=y
# CONFIG_FB_GEODE_GX1 is not set
+CONFIG_FB_SSD1307=m
+
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GODIRECT is not set
# CONFIG_PCI_GOMMCONFIG is not set
@@ -179,6 +181,9 @@ CONFIG_XO1_RFKILL=m
CONFIG_X86_32_IRIS=m
+CONFIG_POWER_RESET_GPIO=y
+
+
CONFIG_MTD_OF_PARTS=y
CONFIG_MTD_PHYSMAP_OF=m
@@ -202,6 +207,9 @@ CONFIG_I2O_EXT_ADAPTEC=y
CONFIG_I2O_CONFIG_OLD_IOCTL=y
CONFIG_I2O_BUS=m
+CONFIG_INPUT_PWM_BEEPER=m
+CONFIG_BACKLIGHT_PWM=m
+
# CONFIG_EDAC_SBRIDGE is not set
# CONFIG_X86_WANT_INTEL_MID is not set
diff --git a/kernel.spec b/kernel.spec
index 671d80596..b7ec075c3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2310,6 +2310,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Jan 07 2013 Justin M. Forbes <jforbes@redhat.com>
+- Fix up configs for build
+
* Mon Jan 07 2013 Josh Boyer <jwboyer@redhat.com>
- Patch to fix efivarfs underflow from Lingzhu Xiang (rhbz 888163)