diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-18 02:54:41 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-18 02:54:41 -0400 |
| commit | 1556f4b4d0abadb5df5e7678cbe7c30d27e7256c (patch) | |
| tree | e8a8cebb7fba68c15525bad47f605935e97045b2 /arch/arm/mach-davinci/board-dm644x-evm.c | |
| parent | 392f9195646cf3bf3950537040eee04eea827c24 (diff) | |
| parent | 58b6c5a133297e0154a085cc73e832222c57729c (diff) | |
Merge tag 'davinci-for-v3.10/board-2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/boards
From Sekhar Nori:
v3.10 board updates for DaVinci
This set of patches enables remoteproc support
on DA850 EVM and fixes some sparse warnings for
the same board.
* tag 'davinci-for-v3.10/board-2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: da850 evm: fix const qualifier placement
ARM: davinci: da850 board: add remoteproc support
ARM: davinci: ensure global variables are declared
ARM: davinci: sram.c: fix incorrect type in assignment
ARM: davinci: da8xx dt: make file local symbols static
ARM: davinci: da8xx: add remoteproc support
ARM: davinci: remove test for undefined Kconfig macro
ARM: davinci: mmc: derive version information from device name
ARM: davinci: da850: add ECAP & EHRPWM clock nodes
ARM: davinci: clk framework support for enable/disable functionality
Diffstat (limited to 'arch/arm/mach-davinci/board-dm644x-evm.c')
| -rw-r--r-- | arch/arm/mach-davinci/board-dm644x-evm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index a042f27fb6bc..fc8e38e31b89 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c | |||
| @@ -570,7 +570,6 @@ static struct davinci_mmc_config dm6446evm_mmc_config = { | |||
| 570 | .get_cd = dm6444evm_mmc_get_cd, | 570 | .get_cd = dm6444evm_mmc_get_cd, |
| 571 | .get_ro = dm6444evm_mmc_get_ro, | 571 | .get_ro = dm6444evm_mmc_get_ro, |
| 572 | .wires = 4, | 572 | .wires = 4, |
| 573 | .version = MMC_CTLR_VERSION_1 | ||
| 574 | }; | 573 | }; |
| 575 | 574 | ||
| 576 | static struct i2c_board_info __initdata i2c_info[] = { | 575 | static struct i2c_board_info __initdata i2c_info[] = { |