diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-09 11:14:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-09 11:14:20 -0800 |
| commit | 451688ba0b488faf274e13dc591734b1e695642c (patch) | |
| tree | 7d746efef856c1897697c30e2486317e823e727d /drivers | |
| parent | acac103e2d00c9bc7507838319c71a0f5dc50678 (diff) | |
| parent | ed2c9fa53b7a3e240a64e6e97494d72d0f80eed0 (diff) | |
| download | kernel-crypto-451688ba0b488faf274e13dc591734b1e695642c.tar.gz kernel-crypto-451688ba0b488faf274e13dc591734b1e695642c.tar.xz kernel-crypto-451688ba0b488faf274e13dc591734b1e695642c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
Kbuild: Fix deb-pkg target to work with kernel versions ending with -<text-without-digit>
ide: introduce HAVE_IDE
kbuild: silence CHK/UPD messages according to $(quiet)
scsi: fix makefile for aic7(3*x)
kbuild/modpost: Use warn() for announcing section mismatches
Add binoffset to gitignore
kbuild/modpost: improve warnings if symbol is unknown
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ide/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/pcmcia/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/scsi/aic7xxx/Makefile | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index ab8fb257528..043c34ad0a0 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -4,10 +4,14 @@ # Andre Hedrick <andre@linux-ide.org> # +# Select HAVE_IDE if IDE is supported +config HAVE_IDE + def_bool n + menuconfig IDE tristate "ATA/ATAPI/MFM/RLL support" + depends on HAVE_IDE depends on BLOCK - depends on HAS_IOMEM ---help--- If you say Y here, your kernel will be able to manage low cost mass storage units such as ATA/(E)IDE and ATAPI units. The most common diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 519b4ff79f7..8b22281b087 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -38,6 +38,7 @@ config PCMCIA_DEBUG config PCMCIA tristate "16-bit PCMCIA support" select CRC32 + select HAVE_IDE default y ---help--- This option enables support for 16-bit PCMCIA cards. Most older diff --git a/drivers/scsi/aic7xxx/Makefile b/drivers/scsi/aic7xxx/Makefile index 4c549540a35..741d81861d1 100644 --- a/drivers/scsi/aic7xxx/Makefile +++ b/drivers/scsi/aic7xxx/Makefile @@ -44,8 +44,8 @@ clean-files += aic79xx_seq.h aic79xx_reg.h aic79xx_reg_print.c # Dependencies for generated files need to be listed explicitly -$(addprefix $(src)/,$(aic7xxx-y:.o=.c)): $(obj)/aic7xxx_seq.h $(obj)/aic7xxx_reg.h -$(addprefix $(src)/,$(aic79xx-y:.o=.c)): $(obj)/aic79xx_seq.h $(obj)/aic79xx_reg.h +$(addprefix $(obj)/,$(aic7xxx-y)): $(obj)/aic7xxx_seq.h $(obj)/aic7xxx_reg.h +$(addprefix $(obj)/,$(aic79xx-y)): $(obj)/aic79xx_seq.h $(obj)/aic79xx_reg.h aic7xxx-gen-$(CONFIG_AIC7XXX_BUILD_FIRMWARE) := $(obj)/aic7xxx_reg.h aic7xxx-gen-$(CONFIG_AIC7XXX_REG_PRETTY_PRINT) += $(obj)/aic7xxx_reg_print.c |