diff options
| author | David S. Miller <davem@davemloft.net> | 2013-06-28 22:13:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-28 22:13:14 -0700 |
| commit | 6be44b1f0bdaa9b8e57b4e62045302cabcbbb636 (patch) | |
| tree | 9bf9ec1d22a8480c147c069fa4d80a2bd20fc9de /include | |
| parent | d36a21da415b8e6545ae8b4eb6b23eea2ce001c8 (diff) | |
| parent | 1f3e4b0cc4deb9d740261273fbbf5ea95c8434d0 (diff) | |
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
this is a pull-request for net-next/master. It consists of three
patches by Fabio Estevam and me, which convert the flexcan transceiver
switching to DT[1] and a patch by Sachin Kamat, which cleans up the
at91_can driver a bit.
[1] These patches touch arch/arm/mach-imx, so I collected Acked-bys
from Shawn Guo and Sascha Hauer.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/can/platform/flexcan.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/linux/can/platform/flexcan.h b/include/linux/can/platform/flexcan.h deleted file mode 100644 index 72b713ab57e..00000000000 --- a/include/linux/can/platform/flexcan.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (C) 2010 Marc Kleine-Budde <kernel@pengutronix.de> - * - * This file is released under the GPLv2 - * - */ - -#ifndef __CAN_PLATFORM_FLEXCAN_H -#define __CAN_PLATFORM_FLEXCAN_H - -/** - * struct flexcan_platform_data - flex CAN controller platform data - * @transceiver_enable: - called to power on/off the transceiver - * - */ -struct flexcan_platform_data { - void (*transceiver_switch)(int enable); -}; - -#endif /* __CAN_PLATFORM_FLEXCAN_H */ |