[linux] 01/05: [m68k] Change MAC8390, MAC_SCSI from built-in to modules (Closes: #826614)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit d7a4c15c51925dedf266fe186aa985600d89c160
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Feb 17 02:21:21 2017 +0000

    [m68k] Change MAC8390, MAC_SCSI from built-in to modules (Closes: #826614)
    
    udeb: Add mac8390 to nic-shared-modules
---
 debian/changelog                                      | 2 ++
 debian/config/m68k/config                             | 6 +++---
 debian/installer/m68k/modules/m68k/nic-shared-modules | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 99d8f1e..4f6f749 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -252,6 +252,8 @@ linux (4.9.10-1) UNRELEASED; urgency=medium
   * [arm64] drm: Enable DRM_AST as module (Closes: #820168)
     - udeb: Add ast to fb-modules
   * [armel/marvell] hwmon: Enable SENSORS_G762 as module (Closes: #854662)
+  * [m68k] Change MAC8390, MAC_SCSI from built-in to modules (Closes: #826614)
+    - udeb: Add mac8390 to nic-shared-modules
 
   [ Roger Shimizu ]
   * [armel] ARM: dts: orion5x-lschl: Fix model name
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index c2084d5..2c49fd7 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -373,7 +373,7 @@ CONFIG_DEV_APPLETALK=m
 ## file: drivers/net/ethernet/8390/Kconfig
 ##
 CONFIG_HYDRA=m
-CONFIG_MAC8390=y
+CONFIG_MAC8390=m
 CONFIG_NE2000=m
 CONFIG_APNE=m
 CONFIG_ZORRO8390=m
@@ -483,7 +483,7 @@ CONFIG_RTC_DRV_GENERIC=y
 ##
 ## file: drivers/scsi/Kconfig
 ##
-#. for MAC_SCSI and MVME147_SCSI that are not tristate
+#. for MVME147_SCSI that is not tristate
 CONFIG_SCSI=y
 CONFIG_SCSI_SPI_ATTRS=m
 # CONFIG_SCSI_FC_ATTRS is not set
@@ -496,7 +496,7 @@ CONFIG_GVP11_SCSI=m
 CONFIG_SCSI_A4000T=m
 CONFIG_SCSI_ZORRO7XX=m
 CONFIG_ATARI_SCSI=m
-CONFIG_MAC_SCSI=y
+CONFIG_MAC_SCSI=m
 CONFIG_SCSI_MAC_ESP=m
 CONFIG_MVME147_SCSI=y
 CONFIG_MVME16x_SCSI=m
diff --git a/debian/installer/m68k/modules/m68k/nic-shared-modules b/debian/installer/m68k/modules/m68k/nic-shared-modules
index 4f74c1f..5bff60c 100644
--- a/debian/installer/m68k/modules/m68k/nic-shared-modules
+++ b/debian/installer/m68k/modules/m68k/nic-shared-modules
@@ -10,6 +10,7 @@ ariadne2 ?
 atarilance ?
 dummy
 hydra ?
+mac8390 ?
 mac89x0 ?
 macsonic ?
 zorro8390 ?

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git