testing/linux-grsec: misc config tweaking

enable some kernel modules that I think makes sense
- x86 reboot fixups (i think someone reported issues with rebooting)
- misc generic kernel modules

2 files changed, 13 insertions, 9 deletions

diff --git a/testing/linux-grsec/APKBUILD b/testing/linux-grsec/APKBUILD
index 6a685381e6..ba7a54cbd6 100644
--- a/testing/linux-grsec/APKBUILD
+++ b/testing/linux-grsec/APKBUILD
@@ -141,5 +141,5 @@ md5sums="7d471477bfa67546f902da62227fa976  linux-2.6.38.tar.bz2
 b659409d212d3a3748a5d750443d2a1b  grsecurity-2.2.2-2.6.38.6-201105182052.patch
 776adeeb5272093574f8836c5037dd7d  0004-arp-flush-arp-cache-on-device-change.patch
 aa1b82da0cabfb41c5e6da5bddf60bab  net-gre-provide-multicast-mappings-for-ipv4-and-ipv6.patch
-f197315230ed25945bb14c0851daf28d  kernelconfig.x86
+f4cf5b0ddfeef7aa87fb27792aff88a4  kernelconfig.x86
 0a73d8d896101de90f47dae32119e7ca  kernelconfig.x86_64"
diff --git a/testing/linux-grsec/kernelconfig.x86 b/testing/linux-grsec/kernelconfig.x86
index c96c02e2a3..f21ca50e0e 100644
--- a/testing/linux-grsec/kernelconfig.x86
+++ b/testing/linux-grsec/kernelconfig.x86
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/i386 2.6.38.6 Kernel Configuration
-# Thu May 19 13:01:05 2011
+# Thu May 19 13:36:21 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -358,9 +358,9 @@ CONFIG_X86_IO_APIC=y
 # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
 # CONFIG_X86_MCE is not set
 CONFIG_VM86=y
-# CONFIG_TOSHIBA is not set
+CONFIG_TOSHIBA=m
 CONFIG_I8K=m
-# CONFIG_X86_REBOOTFIXUPS is not set
+CONFIG_X86_REBOOTFIXUPS=y
 CONFIG_MICROCODE=m
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
@@ -552,7 +552,8 @@ CONFIG_PCI_IOAPIC=y
 CONFIG_ISA_DMA_API=y
 # CONFIG_ISA is not set
 # CONFIG_MCA is not set
-# CONFIG_SCx200 is not set
+CONFIG_SCx200=m
+CONFIG_SCx200HR_TIMER=m
 # CONFIG_OLPC is not set
 # CONFIG_OLPC_OPENFIRMWARE is not set
 CONFIG_AMD_NB=y
@@ -1292,6 +1293,7 @@ CONFIG_MTD_SC520CDP=m
 CONFIG_MTD_NETSC520=m
 CONFIG_MTD_TS5500=m
 CONFIG_MTD_SBC_GXX=m
+# CONFIG_MTD_SCx200_DOCFLASH is not set
 CONFIG_MTD_AMD76XROM=m
 CONFIG_MTD_ICHXROM=m
 CONFIG_MTD_ESB2ROM=m
@@ -2548,6 +2550,7 @@ CONFIG_CARDMAN_4000=m
 CONFIG_CARDMAN_4040=m
 CONFIG_IPWIRELESS=m
 CONFIG_MWAVE=m
+# CONFIG_SCx200_GPIO is not set
 # CONFIG_PC8736x_GPIO is not set
 # CONFIG_NSC_GPIO is not set
 CONFIG_RAW_DRIVER=m
@@ -2885,6 +2888,7 @@ CONFIG_IT8712F_WDT=m
 CONFIG_IT87_WDT=m
 # CONFIG_HP_WATCHDOG is not set
 CONFIG_SC1200_WDT=m
+# CONFIG_SCx200_WDT is not set
 CONFIG_PC87413_WDT=m
 CONFIG_NV_TCO=m
 CONFIG_60XX_WDT=m
@@ -4015,7 +4019,7 @@ CONFIG_USB_STORAGE_ALAUDA=m
 CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
 CONFIG_USB_LIBUSUAL=y
 
 #
@@ -4326,7 +4330,7 @@ CONFIG_UIO_PDRV=m
 CONFIG_UIO_PDRV_GENIRQ=m
 CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
-# CONFIG_UIO_PCI_GENERIC is not set
+CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
 CONFIG_STAGING=y
 # CONFIG_STAGING_EXCLUDE_BUILD is not set
@@ -4428,7 +4432,7 @@ CONFIG_PANASONIC_LAPTOP=m
 CONFIG_COMPAL_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
 # CONFIG_SONYPI_COMPAT is not set
-# CONFIG_IDEAPAD_LAPTOP is not set
+CONFIG_IDEAPAD_LAPTOP=m
 CONFIG_THINKPAD_ACPI=m
 CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
 # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
@@ -4447,7 +4451,7 @@ CONFIG_ACPI_ASUS=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_ACPI_CMPC=m
-# CONFIG_INTEL_IPS is not set
+CONFIG_INTEL_IPS=m
 # CONFIG_IBM_RTL is not set
 
 #