diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-20 13:56:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-20 13:56:03 -0400 |
| commit | 54f0e9ba95c8011b8c90b0d20075f0a9491346a9 (patch) | |
| tree | ba0b60b3b540c2dfcd57d7b7b2dcb0c4c6dcd54d /include | |
| parent | 90b90f60c4f8e3a8525dfeb4aec46a9c7a29c857 (diff) | |
| parent | 3b5c6b9e49f78f07ebcd34b38c1185e57a0fd9eb (diff) | |
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
the fifth pull request for upcoming v3.6 net-next cleans up and
improves the janz-ican3 driver (6 patches by Ira W. Snyder, one by me).
A patch by Steffen Trumtrar adds imx53 support to the flexcan driver.
And another patch by me, which marks the bit timing constant in the CAN
drivers as "const".
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/can/dev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h index ee5a771fb20d..2b2fc345afca 100644 --- a/include/linux/can/dev.h +++ b/include/linux/can/dev.h | |||
| @@ -33,7 +33,7 @@ struct can_priv { | |||
| 33 | struct can_device_stats can_stats; | 33 | struct can_device_stats can_stats; |
| 34 | 34 | ||
| 35 | struct can_bittiming bittiming; | 35 | struct can_bittiming bittiming; |
| 36 | struct can_bittiming_const *bittiming_const; | 36 | const struct can_bittiming_const *bittiming_const; |
| 37 | struct can_clock clock; | 37 | struct can_clock clock; |
| 38 | 38 | ||
| 39 | enum can_state state; | 39 | enum can_state state; |