diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:56:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:56:17 -0500 |
| commit | 519cb688072008363e091be3f291c1b5779e2ba8 (patch) | |
| tree | dc5e251ff0eac8ae2f022858c0d7526299235f1d /drivers/scsi | |
| parent | 2f98735c9c24ea1f0d40a364d4e63611b689b795 (diff) | |
| parent | 8891fec65ac5b5a74b50c705e31b66c92c3eddeb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
scsi: fix dependency bug in aic7 Makefile
kbuild: add svn revision information to setlocalversion
kbuild: do not warn about __*init/__*exit symbols being exported
Move Kconfig.instrumentation to arch/Kconfig and init/Kconfig
Add HAVE_KPROBES
Add HAVE_OPROFILE
Create arch/Kconfig
Fix ARM to play nicely with generic Instrumentation menu
kconfig: ignore select of unknown symbol
kconfig: mark config as changed when loading an alternate config
kbuild: Spelling/grammar fixes for config DEBUG_SECTION_MISMATCH
Remove __INIT_REFOK and __INITDATA_REFOK
kbuild: print only total number of section mismatces found
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/aic7xxx/Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/scsi/aic7xxx/Makefile b/drivers/scsi/aic7xxx/Makefile index e4f70c563bc2..4c549540a35d 100644 --- a/drivers/scsi/aic7xxx/Makefile +++ b/drivers/scsi/aic7xxx/Makefile | |||
| @@ -44,13 +44,8 @@ clean-files += aic79xx_seq.h aic79xx_reg.h aic79xx_reg_print.c | |||
| 44 | 44 | ||
| 45 | # Dependencies for generated files need to be listed explicitly | 45 | # Dependencies for generated files need to be listed explicitly |
| 46 | 46 | ||
| 47 | $(obj)/aic7xxx_core.o: $(obj)/aic7xxx_seq.h | 47 | $(addprefix $(src)/,$(aic7xxx-y:.o=.c)): $(obj)/aic7xxx_seq.h $(obj)/aic7xxx_reg.h |
| 48 | $(obj)/aic7xxx_core.o: $(obj)/aic7xxx_reg.h | 48 | $(addprefix $(src)/,$(aic79xx-y:.o=.c)): $(obj)/aic79xx_seq.h $(obj)/aic79xx_reg.h |
| 49 | $(obj)/aic79xx_core.o: $(obj)/aic79xx_seq.h | ||
| 50 | $(obj)/aic79xx_core.o: $(obj)/aic79xx_reg.h | ||
| 51 | |||
| 52 | $(addprefix $(obj)/,$(aic7xxx-y)): $(obj)/aic7xxx_seq.h | ||
| 53 | $(addprefix $(obj)/,$(aic79xx-y)): $(obj)/aic79xx_seq.h | ||
| 54 | 49 | ||
| 55 | aic7xxx-gen-$(CONFIG_AIC7XXX_BUILD_FIRMWARE) := $(obj)/aic7xxx_reg.h | 50 | aic7xxx-gen-$(CONFIG_AIC7XXX_BUILD_FIRMWARE) := $(obj)/aic7xxx_reg.h |
| 56 | aic7xxx-gen-$(CONFIG_AIC7XXX_REG_PRETTY_PRINT) += $(obj)/aic7xxx_reg_print.c | 51 | aic7xxx-gen-$(CONFIG_AIC7XXX_REG_PRETTY_PRINT) += $(obj)/aic7xxx_reg_print.c |