瀏覽代碼

[SCSI] fix pcmcia compile problem

This patch

commit 8ae732a91df051aba6820068a47b631a06599d84
Author: Tejun Heo <htejun@gmail.com>
Date:   Fri Dec 7 22:36:23 2007 +0900

    [SCSI] make pcmcia directory use obj-y|m instead of subdir-y|m

Moved the scsi Makefile into conformance, but also caused the pcmcia
subdirectory to get built in for the first time, leading to duplicate
symbols in an allyesconfig build.  Since evidently no-one relies on
these being built in, fix this by ensuring they can only be built as
modules.

Acked-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
James Bottomley 17 年之前
父節點
當前提交
b523381e32
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      drivers/scsi/pcmcia/Kconfig

+ 2 - 1
drivers/scsi/pcmcia/Kconfig

@@ -6,7 +6,8 @@ menuconfig SCSI_LOWLEVEL_PCMCIA
 	bool "PCMCIA SCSI adapter support"
 	bool "PCMCIA SCSI adapter support"
 	depends on SCSI!=n && PCMCIA!=n
 	depends on SCSI!=n && PCMCIA!=n
 
 
-if SCSI_LOWLEVEL_PCMCIA && SCSI && PCMCIA
+# drivers have problems when build in, so require modules
+if SCSI_LOWLEVEL_PCMCIA && SCSI && PCMCIA && m
 
 
 config PCMCIA_AHA152X
 config PCMCIA_AHA152X
 	tristate "Adaptec AHA152X PCMCIA support"
 	tristate "Adaptec AHA152X PCMCIA support"