| commit | c157750a901d767ecb95f1dbabd0972dee396b1e | [log] [tgz] |
|---|---|---|
| author | James Bottomley <JBottomley@Parallels.com> | Fri Mar 01 09:08:44 2013 +0000 |
| committer | James Bottomley <JBottomley@Parallels.com> | Fri Mar 01 09:08:44 2013 +0000 |
| tree | c60874bc22cbcea6fb2ef32f71251a1771527169 | |
| parent | e0eca63e342124cff4307eafb43908cab5b3cf88 [diff] | |
| parent | ee7afd717c26299c85675d84c7ff89a9c989f4fa [diff] |
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 <JBottomley@Parallels.com>
diff --git a/include/scsi/Kbuild b/include/scsi/Kbuild index f2b9491..562ff9d 100644 --- 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 index 29a87dd..75746d5 100644 --- 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 b/include/uapi/scsi/scsi_bsg_fc.h similarity index 100% rename from include/scsi/scsi_bsg_fc.h rename to include/uapi/scsi/scsi_bsg_fc.h
diff --git a/include/scsi/scsi_netlink.h b/include/uapi/scsi/scsi_netlink.h similarity index 100% rename from include/scsi/scsi_netlink.h rename to include/uapi/scsi/scsi_netlink.h
diff --git a/include/scsi/scsi_netlink_fc.h b/include/uapi/scsi/scsi_netlink_fc.h similarity index 100% rename from include/scsi/scsi_netlink_fc.h rename to include/uapi/scsi/scsi_netlink_fc.h