diff options
| author | David S. Miller <davem@davemloft.net> | 2015-09-21 17:15:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-21 17:15:03 -0700 |
| commit | 607cba1554cbdfd8d9f4a645f235e1dc909ba33f (patch) | |
| tree | c1ff3407bb28b46ee96fc63aa95b3a4649a7dbf8 /include | |
| parent | 852bcafb99247abb3a2876625a3adf684c42e015 (diff) | |
| parent | 6fa7da249269a6146ce456c43098901c81c8afdf (diff) | |
| download | linux-607cba1554cbdfd8d9f4a645f235e1dc909ba33f.tar.gz linux-607cba1554cbdfd8d9f4a645f235e1dc909ba33f.tar.bz2 linux-607cba1554cbdfd8d9f4a645f235e1dc909ba33f.zip | |
Merge tag 'linux-can-next-for-4.4-20150921' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2015-09-17
this is a pull request of 8 patches for net-next/master.
All 8 patches are by me and cleanup the flexcan driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/can/dev.h | 3 | ||||
| -rw-r--r-- | include/linux/can/led.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h index c3a9c8fc60fa..56dcadd83716 100644 --- a/include/linux/can/dev.h +++ b/include/linux/can/dev.h @@ -14,9 +14,10 @@ #define _CAN_DEV_H #include <linux/can.h> -#include <linux/can/netlink.h> #include <linux/can/error.h> #include <linux/can/led.h> +#include <linux/can/netlink.h> +#include <linux/netdevice.h> /* * CAN mode diff --git a/include/linux/can/led.h b/include/linux/can/led.h index 146de4506d21..2746f7c2f87d 100644 --- a/include/linux/can/led.h +++ b/include/linux/can/led.h @@ -11,6 +11,7 @@ #include <linux/if.h> #include <linux/leds.h> +#include <linux/netdevice.h> enum can_led_event { CAN_LED_EVENT_OPEN, |