diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2013-03-01 09:08:44 +0000 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-03-01 09:08:44 +0000 |
| commit | c157750a901d767ecb95f1dbabd0972dee396b1e (patch) | |
| 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>
| -rw-r--r-- | include/scsi/Kbuild | 3 | ||||
| -rw-r--r-- | include/uapi/scsi/Kbuild | 3 | ||||
| -rw-r--r-- | include/uapi/scsi/scsi_bsg_fc.h (renamed from include/scsi/scsi_bsg_fc.h) | 0 | ||||
| -rw-r--r-- | include/uapi/scsi/scsi_netlink.h (renamed from include/scsi/scsi_netlink.h) | 0 | ||||
| -rw-r--r-- | include/uapi/scsi/scsi_netlink_fc.h (renamed from include/scsi/scsi_netlink_fc.h) | 0 |
5 files changed, 3 insertions, 3 deletions
diff --git a/include/scsi/Kbuild b/include/scsi/Kbuild index f2b94918994..562ff9d591b 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 29a87dd26cf..75746d52f20 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 index 3031b900b08..3031b900b08 100644 --- a/include/scsi/scsi_bsg_fc.h +++ b/include/uapi/scsi/scsi_bsg_fc.h diff --git a/include/scsi/scsi_netlink.h b/include/uapi/scsi/scsi_netlink.h index 62b4edab15d..62b4edab15d 100644 --- a/include/scsi/scsi_netlink.h +++ b/include/uapi/scsi/scsi_netlink.h diff --git a/include/scsi/scsi_netlink_fc.h b/include/uapi/scsi/scsi_netlink_fc.h index cbf76e47976..cbf76e47976 100644 --- a/include/scsi/scsi_netlink_fc.h +++ b/include/uapi/scsi/scsi_netlink_fc.h |