diff options
| author | David S. Miller <davem@davemloft.net> | 2010-10-18 07:11:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-18 07:11:44 -0700 |
| commit | a47d60561e111f5009ad0964069cfff77f76dbaa (patch) | |
| tree | 2e11d4cbc43759bb217263533e5e1539ac71df7e /include/linux | |
| parent | d8e62719ea63daf6afde2d2d09fb861c1559711e (diff) | |
| parent | 9c473fc33915ddb14b71a4929c838c22b20a24ce (diff) | |
Merge branch 'can/mcp251x-for-net-next' of git://git.pengutronix.de/git/mkl/linux-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/can/platform/mcp251x.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/can/platform/mcp251x.h b/include/linux/can/platform/mcp251x.h index dba28268e651..8e20540043f5 100644 --- a/include/linux/can/platform/mcp251x.h +++ b/include/linux/can/platform/mcp251x.h @@ -12,7 +12,6 @@ /** * struct mcp251x_platform_data - MCP251X SPI CAN controller platform data * @oscillator_frequency: - oscillator frequency in Hz - * @model: - actual type of chip * @board_specific_setup: - called before probing the chip (power,reset) * @transceiver_enable: - called to power on/off the transceiver * @power_enable: - called to power on/off the mcp *and* the @@ -25,9 +24,6 @@ struct mcp251x_platform_data { unsigned long oscillator_frequency; - int model; -#define CAN_MCP251X_MCP2510 0x2510 -#define CAN_MCP251X_MCP2515 0x2515 int (*board_specific_setup)(struct spi_device *spi); int (*transceiver_enable)(int enable); int (*power_enable) (int enable); |