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 /Documentation/kbuild | |
| 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 'Documentation/kbuild')
| -rw-r--r-- | Documentation/kbuild/makefiles.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index a9c00facdf40..14ef3868a328 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt | |||
| @@ -1123,6 +1123,14 @@ The top Makefile exports the following variables: | |||
| 1123 | $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE). The user may | 1123 | $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE). The user may |
| 1124 | override this value on the command line if desired. | 1124 | override this value on the command line if desired. |
| 1125 | 1125 | ||
| 1126 | INSTALL_MOD_STRIP | ||
| 1127 | |||
| 1128 | If this variable is specified, will cause modules to be stripped | ||
| 1129 | after they are installed. If INSTALL_MOD_STRIP is '1', then the | ||
| 1130 | default option --strip-debug will be used. Otherwise, | ||
| 1131 | INSTALL_MOD_STRIP will used as the option(s) to the strip command. | ||
| 1132 | |||
| 1133 | |||
| 1126 | === 8 Makefile language | 1134 | === 8 Makefile language |
| 1127 | 1135 | ||
| 1128 | The kernel Makefiles are designed to run with GNU Make. The Makefiles | 1136 | The kernel Makefiles are designed to run with GNU Make. The Makefiles |