diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /arch/xtensa/Makefile | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/xtensa/Makefile')
| -rw-r--r-- | arch/xtensa/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index 98fac8489aed..3a3a4c66ef87 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile | |||
| @@ -71,7 +71,7 @@ archprepare: $(archinc)/.platform | |||
| 71 | # Update machine cpu and platform symlinks if something which affects | 71 | # Update machine cpu and platform symlinks if something which affects |
| 72 | # them changed. | 72 | # them changed. |
| 73 | 73 | ||
| 74 | $(archinc)/.platform: $(wildcard include/config/arch/*.h) include/config/MARKER | 74 | $(archinc)/.platform: $(wildcard include/config/arch/*.h) include/config/auto.conf |
| 75 | @echo ' SYMLINK $(archinc)/xtensa/config -> $(archinc)/xtensa/config-$(CPU)' | 75 | @echo ' SYMLINK $(archinc)/xtensa/config -> $(archinc)/xtensa/config-$(CPU)' |
| 76 | $(Q)mkdir -p $(archinc) | 76 | $(Q)mkdir -p $(archinc) |
| 77 | $(Q)mkdir -p $(archinc)/xtensa | 77 | $(Q)mkdir -p $(archinc)/xtensa |