Merge branch 'uapi-for-3.7' of git://gitorious.org/linux-can/linux-can (959859d2) · Commits · 戴 / test

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>

include/linux/can/Kbuild

+0 −5

Original line number	Diff line number	Diff line
		header-y += raw.h
		header-y += bcm.h
		header-y += gw.h
		header-y += error.h
		header-y += netlink.h

include/uapi/linux/can/Kbuild

+5 −0

Original line number	Diff line number	Diff line
		# UAPI Header export list
		header-y += bcm.h
		header-y += error.h
		header-y += gw.h
		header-y += netlink.h
		header-y += raw.h

include/linux/can/bcm.h→include/uapi/linux/can/bcm.h

+0 −0

File moved.

View file

include/linux/can/error.h→include/uapi/linux/can/error.h

+0 −0

File moved.

View file

include/linux/can/gw.h→include/uapi/linux/can/gw.h

+0 −0

File moved.

View file

Admin message