diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /include/linux/Kbuild | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/linux/Kbuild')
| -rw-r--r-- | include/linux/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index bcd01f269f60..e1013156c25e 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -239,6 +239,7 @@ unifdef-y += ipc.h | |||
| 239 | unifdef-y += ipmi.h | 239 | unifdef-y += ipmi.h |
| 240 | unifdef-y += ipv6.h | 240 | unifdef-y += ipv6.h |
| 241 | unifdef-y += ipv6_route.h | 241 | unifdef-y += ipv6_route.h |
| 242 | unifdef-y += ip6_tunnel.h | ||
| 242 | unifdef-y += isdn.h | 243 | unifdef-y += isdn.h |
| 243 | unifdef-y += isdnif.h | 244 | unifdef-y += isdnif.h |
| 244 | unifdef-y += isdn_divertif.h | 245 | unifdef-y += isdn_divertif.h |