Skip to content

Commit

Permalink
Merge branch 'uapi-for-3.7' of git://gitorious.org/linux-can/linux-can
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David S. Miller committed Oct 11, 2012
2 parents 68aaed5 + 922cd65 commit 959859d
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 5 deletions.
5 changes: 0 additions & 5 deletions include/linux/can/Kbuild
Original file line number Diff line number Diff line change
@@ -1,5 +0,0 @@
header-y += raw.h
header-y += bcm.h
header-y += gw.h
header-y += error.h
header-y += netlink.h
5 changes: 5 additions & 0 deletions include/uapi/linux/can/Kbuild
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 959859d

Please sign in to comment.