aboutsummaryrefslogtreecommitdiff
path: root/include/scsi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-22 12:56:22 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-22 12:56:22 -0700
commite6e5fee1426bef07f4e6c3c76f48343c14207938 (patch)
tree28f4ca26cf85e0971e9bb4927c439b36c2b93f51 /include/scsi
parent3e59ddff2b8dfe42b15520c4f8f2486bd9f9708e (diff)
parentfadcfa33b6319a5faf8af2287f08bf93a7f926b6 (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/Kbuild4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/scsi/Kbuild b/include/scsi/Kbuild
index 14a033d7331..744f85011f1 100644
--- a/include/scsi/Kbuild
+++ b/include/scsi/Kbuild
@@ -1,2 +1,4 @@
header-y += scsi.h
-unifdef-y := scsi_ioctl.h sg.h
+
+unifdef-y += scsi_ioctl.h
+unifdef-y += sg.h