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 /usr/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 'usr/Makefile')
| -rw-r--r-- | usr/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usr/Makefile b/usr/Makefile index 19d74e6f2685..e93824269da2 100644 --- a/usr/Makefile +++ b/usr/Makefile | |||
| @@ -21,8 +21,7 @@ ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \ | |||
| 21 | $(CONFIG_INITRAMFS_SOURCE),-d) | 21 | $(CONFIG_INITRAMFS_SOURCE),-d) |
| 22 | ramfs-args := \ | 22 | ramfs-args := \ |
| 23 | $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \ | 23 | $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \ |
| 24 | $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID)) \ | 24 | $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID)) |
| 25 | $(ramfs-input) | ||
| 26 | 25 | ||
| 27 | # .initramfs_data.cpio.gz.d is used to identify all files included | 26 | # .initramfs_data.cpio.gz.d is used to identify all files included |
| 28 | # in initramfs and to detect if any files are added/removed. | 27 | # in initramfs and to detect if any files are added/removed. |