diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-15 01:36:58 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-15 01:36:58 (GMT) |
| commit | c3503357fb71af9b215541e1959a7db9325c1f0f (patch) | |
| tree | cb0663f96dae37b1b05eeaf179a5bfcbf7f0335d /include | |
| parent | 4568637f7a20bbb1dcbf8ada56de08f6c940bcbd (diff) | |
| parent | 42160a041db89807691b2a3fbf42e36a98b6019e (diff) | |
| download | linux-c3503357fb71af9b215541e1959a7db9325c1f0f.tar.xz | |
Merge tag 'linux-can-next-for-4.4-20151013' 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 4 patches for net-next/master.
Two patches are by Gerhard Bertelsmann, fixing some problems in the
sun4i driver. The patch by Arnd Bergmann stops using timeval for the
CAN broadcast manager. The last patch by Alexandre Belloni removes the
otherwise unused struct at91_can_data from the driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/atmel.h | 5 | ||||
| -rw-r--r-- | include/uapi/linux/can/bcm.h | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h index 527a85c..c121ddf 100644 --- a/include/linux/platform_data/atmel.h +++ b/include/linux/platform_data/atmel.h @@ -74,11 +74,6 @@ struct atmel_uart_data { struct serial_rs485 rs485; /* rs485 settings */ }; -/* CAN */ -struct at91_can_data { - void (*transceiver_switch)(int on); -}; - /* FIXME: this needs a better location, but gets stuff building again */ extern int at91_suspend_entering_slow_clock(void); diff --git a/include/uapi/linux/can/bcm.h b/include/uapi/linux/can/bcm.h index 89ddb9d..7a291dc 100644 --- a/include/uapi/linux/can/bcm.h +++ b/include/uapi/linux/can/bcm.h @@ -47,6 +47,11 @@ #include <linux/types.h> #include <linux/can.h> +struct bcm_timeval { + long tv_sec; + long tv_usec; +}; + /** * struct bcm_msg_head - head of messages to/from the broadcast manager * @opcode: opcode, see enum below. @@ -62,7 +67,7 @@ struct bcm_msg_head { __u32 opcode; __u32 flags; __u32 count; - struct timeval ival1, ival2; + struct bcm_timeval ival1, ival2; canid_t can_id; __u32 nframes; struct can_frame frames[0]; |