diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-01-18 18:47:56 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-01-23 12:29:34 -0500 |
| commit | b523381e325366cc54a2548df418c2a427b2f2ee (patch) | |
| tree | 10b8d6110c3aa34b6bad058466468044f2e14b6a /drivers/scsi/pcmcia | |
| parent | cb1042f285c2168bd8cf10aca0e24802e682252b (diff) | |
[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>
Diffstat (limited to 'drivers/scsi/pcmcia')
| -rw-r--r-- | drivers/scsi/pcmcia/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/pcmcia/Kconfig b/drivers/scsi/pcmcia/Kconfig index fa481b515ead..53857c6b6d4d 100644 --- a/drivers/scsi/pcmcia/Kconfig +++ b/drivers/scsi/pcmcia/Kconfig | |||
| @@ -6,7 +6,8 @@ menuconfig SCSI_LOWLEVEL_PCMCIA | |||
| 6 | bool "PCMCIA SCSI adapter support" | 6 | bool "PCMCIA SCSI adapter support" |
| 7 | depends on SCSI!=n && PCMCIA!=n | 7 | depends on SCSI!=n && PCMCIA!=n |
| 8 | 8 | ||
| 9 | if SCSI_LOWLEVEL_PCMCIA && SCSI && PCMCIA | 9 | # drivers have problems when build in, so require modules |
| 10 | if SCSI_LOWLEVEL_PCMCIA && SCSI && PCMCIA && m | ||
| 10 | 11 | ||
| 11 | config PCMCIA_AHA152X | 12 | config PCMCIA_AHA152X |
| 12 | tristate "Adaptec AHA152X PCMCIA support" | 13 | tristate "Adaptec AHA152X PCMCIA support" |