commit 910f4b83f6b3bfa0f8bcd03c208e0ecf6ddd5d43
author Stewart Smith <stewart@linux.vnet.ibm.com> Fri Jun 16 14:21:29 2017 +1000
committer GitHub <noreply@github.com> Fri Jun 16 14:21:29 2017 +1000
tree 87242a276483a211c07a47d42d2621e3ef9c1100
parent 8e517adae9c8609101f796854ff865a1bd5a780b
parent 697e08dba2b1a33ea43e4f96a377de4ad9fe1caa

Merge pull request #1149 from guilhermepiccoli/master

Change AST and AACRAID drivers to be modules instead of built-in

openpower/configs/linux/skiroot_defconfig

diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index 7e86f24..c0c6bad 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -89,7 +89,7 @@
 CONFIG_SCSI_CXGB4_ISCSI=m
 CONFIG_SCSI_BNX2_ISCSI=m
 CONFIG_BE2ISCSI=m
-CONFIG_SCSI_AACRAID=y
+CONFIG_SCSI_AACRAID=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
@@ -166,7 +166,7 @@
 # CONFIG_I2C_HELPER_AUTO is not set
 CONFIG_DRM=y
 CONFIG_DRM_RADEON=y
-CONFIG_DRM_AST=y
+CONFIG_DRM_AST=m
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_OF=y

openpower/configs/linux/skiroot_p9_defconfig

diff --git a/openpower/configs/linux/skiroot_p9_defconfig b/openpower/configs/linux/skiroot_p9_defconfig
index 9884909..1c6a4c5 100644
--- a/openpower/configs/linux/skiroot_p9_defconfig
+++ b/openpower/configs/linux/skiroot_p9_defconfig
@@ -87,7 +87,7 @@
 CONFIG_SCSI_CXGB3_ISCSI=m
 CONFIG_SCSI_CXGB4_ISCSI=m
 CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_SCSI_AACRAID=y
+CONFIG_SCSI_AACRAID=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
@@ -157,7 +157,7 @@
 # CONFIG_I2C_HELPER_AUTO is not set
 CONFIG_DRM=y
 CONFIG_DRM_RADEON=y
-CONFIG_DRM_AST=y
+CONFIG_DRM_AST=m
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_OF=y