]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[SCSI] fix pcmcia compile problem
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Fri, 18 Jan 2008 23:47:56 +0000 (17:47 -0600)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Wed, 23 Jan 2008 17:29:34 +0000 (11:29 -0600)
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>
drivers/scsi/pcmcia/Kconfig

index fa481b515ead0e745a74de03bb014724ec8b2a20..53857c6b6d4d3841aa08cc40ba8a361691cdf476 100644 (file)
@@ -6,7 +6,8 @@ menuconfig SCSI_LOWLEVEL_PCMCIA
        bool "PCMCIA SCSI adapter support"
        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
        tristate "Adaptec AHA152X PCMCIA support"