Merge tag 'uapi-20121219' into for-linus

UAPI Disintegration 2012-12-19 This is the remaining SCSI part of the UAPI Signed-off-by: James Bottomley <[email protected]>
iegor · Mar 1, 2013 · c157750 · c157750
2 parents e0eca63 + ee7afd7
commit c157750
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/include/scsi/Kbuild b/include/scsi/Kbuild
@@ -1,4 +1 @@
-header-y += scsi_netlink.h
-header-y += scsi_netlink_fc.h
-header-y += scsi_bsg_fc.h
 header-y += fc/
diff --git a/include/uapi/scsi/Kbuild b/include/uapi/scsi/Kbuild
@@ -1,2 +1,5 @@
 # UAPI Header export list
 header-y += fc/
+header-y += scsi_bsg_fc.h
+header-y += scsi_netlink.h
+header-y += scsi_netlink_fc.h
diff --git a/include/scsi/scsi_bsg_fc.h → include/uapi/scsi/scsi_bsg_fc.h b/include/scsi/scsi_bsg_fc.h → include/uapi/scsi/scsi_bsg_fc.h
diff --git a/include/scsi/scsi_netlink.h → include/uapi/scsi/scsi_netlink.h b/include/scsi/scsi_netlink.h → include/uapi/scsi/scsi_netlink.h
diff --git a/include/scsi/scsi_netlink_fc.h → include/uapi/scsi/scsi_netlink_fc.h b/include/scsi/scsi_netlink_fc.h → include/uapi/scsi/scsi_netlink_fc.h