diff options
| author | Stephane Grosjean <s.grosjean@peak-system.com> | 2017-01-19 10:31:06 -0500 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2017-04-25 03:00:44 -0400 |
| commit | c3df7c5755ee1a53cd56a4efcf3426334ab9eea4 (patch) | |
| tree | 454139fd3dfdd4cfc93a2efa316faeb40f28657b | |
| parent | 113ab88b2b689b431904e1d753e20390529ed204 (diff) | |
can: peak: move header file to new can common subdir
The CAN-FD IP from PEAK-System runs into several kinds of PC CAN-FD
interfaces. Up to now, only the USB CAN-FD adapters were supported by
the Kernel. In order to prepare the adding of some new non-USB CAN-FD
interfaces, this patch moves - and rename - the IP definitions file
from its private (usb) sub-directory into a - newly created - CAN specific
one.
Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 2 | ||||
| -rw-r--r-- | include/linux/can/dev/peak_canfd.h (renamed from drivers/net/can/usb/peak_usb/pcan_ucan.h) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c index 64cba85230f8..175c205d3f13 100644 --- a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c +++ b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c | |||
| @@ -19,10 +19,10 @@ | |||
| 19 | #include <linux/can.h> | 19 | #include <linux/can.h> |
| 20 | #include <linux/can/dev.h> | 20 | #include <linux/can/dev.h> |
| 21 | #include <linux/can/error.h> | 21 | #include <linux/can/error.h> |
| 22 | #include <linux/can/dev/peak_canfd.h> | ||
| 22 | 23 | ||
| 23 | #include "pcan_usb_core.h" | 24 | #include "pcan_usb_core.h" |
| 24 | #include "pcan_usb_pro.h" | 25 | #include "pcan_usb_pro.h" |
| 25 | #include "pcan_ucan.h" | ||
| 26 | 26 | ||
| 27 | MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB FD adapter"); | 27 | MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB FD adapter"); |
| 28 | MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB Pro FD adapter"); | 28 | MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB Pro FD adapter"); |
diff --git a/drivers/net/can/usb/peak_usb/pcan_ucan.h b/include/linux/can/dev/peak_canfd.h index 25e20ef2fef8..25e20ef2fef8 100644 --- a/drivers/net/can/usb/peak_usb/pcan_ucan.h +++ b/include/linux/can/dev/peak_canfd.h | |||
