diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-21 20:46:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-21 20:46:41 -0700 |
| commit | d94a0147dcd29189111491adf370ca11616557ff (patch) | |
| tree | 8b5b5ff242d6258bb9c059df3cefc9de8e689690 /arch/arm/mach-pxa/icontrol.c | |
| parent | 327dfd889527ff2313cc4734a3874e1de2e2e656 (diff) | |
| parent | b1ef05a5a20afe50d4188a5b59579bd140758cf0 (diff) | |
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
this pull-request for net-next consists of a series by Alexander
Shiyan, he cleans up the mcp251x driver. As the first patch touches
arch/arm/mach-pxa, it's acked by Haojian Zhuang.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-pxa/icontrol.c')
| -rw-r--r-- | arch/arm/mach-pxa/icontrol.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c index fe31bfcbb8df..c98511c5abd1 100644 --- a/arch/arm/mach-pxa/icontrol.c +++ b/arch/arm/mach-pxa/icontrol.c @@ -73,9 +73,6 @@ static struct pxa2xx_spi_chip mcp251x_chip_info4 = { static struct mcp251x_platform_data mcp251x_info = { .oscillator_frequency = 16E6, - .board_specific_setup = NULL, - .power_enable = NULL, - .transceiver_enable = NULL }; static struct spi_board_info mcp251x_board_info[] = { |