diff options
| author | David S. Miller <davem@davemloft.net> | 2012-10-10 22:57:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-10 22:57:16 -0400 |
| commit | 959859d2fe88fb26e37985445817ef5234bf9a31 (patch) | |
| tree | 36957f514bb0d4336863e7673f4251eacd54b20a /include | |
| parent | 68aaed54e7682aef261d5c2cf99e85a9dbf33a84 (diff) | |
| parent | 922cd657c95fe3e4214d68a958e98288b7a55bba (diff) | |
| download | linux-3.10-959859d2fe88fb26e37985445817ef5234bf9a31.tar.gz linux-3.10-959859d2fe88fb26e37985445817ef5234bf9a31.tar.bz2 linux-3.10-959859d2fe88fb26e37985445817ef5234bf9a31.zip | |
Merge branch 'uapi-for-3.7' of git://gitorious.org/linux-can/linux-can
Marc Kleine-Budde says:
====================
this pull request for net, i.e. the v3.7 release cycle, contains the patch by
David Howells to move the UAPI related headers for the CAN subsystem.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/can/Kbuild | 5 | ||||
| -rw-r--r-- | include/uapi/linux/can/Kbuild | 5 | ||||
| -rw-r--r-- | include/uapi/linux/can/bcm.h (renamed from include/linux/can/bcm.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/can/error.h (renamed from include/linux/can/error.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/can/gw.h (renamed from include/linux/can/gw.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/can/netlink.h (renamed from include/linux/can/netlink.h) | 0 | ||||
| -rw-r--r-- | include/uapi/linux/can/raw.h (renamed from include/linux/can/raw.h) | 0 |
7 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/can/Kbuild b/include/linux/can/Kbuild index c62b7f1728f..e69de29bb2d 100644 --- a/include/linux/can/Kbuild +++ b/include/linux/can/Kbuild @@ -1,5 +0,0 @@ -header-y += raw.h -header-y += bcm.h -header-y += gw.h -header-y += error.h -header-y += netlink.h diff --git a/include/uapi/linux/can/Kbuild b/include/uapi/linux/can/Kbuild index aafaa5aa54d..21c91bf25a2 100644 --- a/include/uapi/linux/can/Kbuild +++ b/include/uapi/linux/can/Kbuild @@ -1 +1,6 @@ # UAPI Header export list +header-y += bcm.h +header-y += error.h +header-y += gw.h +header-y += netlink.h +header-y += raw.h diff --git a/include/linux/can/bcm.h b/include/uapi/linux/can/bcm.h index 3ebe387fea4..3ebe387fea4 100644 --- a/include/linux/can/bcm.h +++ b/include/uapi/linux/can/bcm.h diff --git a/include/linux/can/error.h b/include/uapi/linux/can/error.h index 7b7148bded7..7b7148bded7 100644 --- a/include/linux/can/error.h +++ b/include/uapi/linux/can/error.h diff --git a/include/linux/can/gw.h b/include/uapi/linux/can/gw.h index 8e1db18c3cb..8e1db18c3cb 100644 --- a/include/linux/can/gw.h +++ b/include/uapi/linux/can/gw.h diff --git a/include/linux/can/netlink.h b/include/uapi/linux/can/netlink.h index 14966ddb7df..14966ddb7df 100644 --- a/include/linux/can/netlink.h +++ b/include/uapi/linux/can/netlink.h diff --git a/include/linux/can/raw.h b/include/uapi/linux/can/raw.h index a814062b071..a814062b071 100644 --- a/include/linux/can/raw.h +++ b/include/uapi/linux/can/raw.h |