diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 15:56:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 15:56:22 -0400 |
| commit | e6e5fee1426bef07f4e6c3c76f48343c14207938 (patch) | |
| tree | 28f4ca26cf85e0971e9bb4927c439b36c2b93f51 /include/scsi | |
| parent | 3e59ddff2b8dfe42b15520c4f8f2486bd9f9708e (diff) | |
| parent | fadcfa33b6319a5faf8af2287f08bf93a7f926b6 (diff) | |
Merge git://git.infradead.org/~dwmw2/hdroneline
* git://git.infradead.org/~dwmw2/hdroneline:
[HEADERS] One line per header in Kbuild files to reduce conflicts
Manual (trivial) conflict resolution in include/asm-s390/Kbuild
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/Kbuild | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/scsi/Kbuild b/include/scsi/Kbuild index 14a033d73314..744f85011f1e 100644 --- a/include/scsi/Kbuild +++ b/include/scsi/Kbuild | |||
| @@ -1,2 +1,4 @@ | |||
| 1 | header-y += scsi.h | 1 | header-y += scsi.h |
| 2 | unifdef-y := scsi_ioctl.h sg.h | 2 | |
| 3 | unifdef-y += scsi_ioctl.h | ||
| 4 | unifdef-y += sg.h | ||