diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-09 17:27:13 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-09 17:27:13 -0800 |
| commit | 93ce285503e375a4a751b632dd7b93291629c5cd (patch) | |
| tree | 83ddfe4de81a87f9fecae220782a28ae340864c1 /arch/arm/mach-davinci/include | |
| parent | 13c5d51953441bd03cfd057e8f340100516ef24c (diff) | |
| parent | 19c7c0d81a9b1fe7342d0208b629b5e085e4f3ae (diff) | |
| download | blackbird-op-linux-93ce285503e375a4a751b632dd7b93291629c5cd.tar.gz blackbird-op-linux-93ce285503e375a4a751b632dd7b93291629c5cd.zip | |
Merge tag 'davinci-for-v3.9/dt-2' of git://gitorious.org/linux-davinci/linux-davinci into next/dt
From Sekhar Nori:
Second round of DT updates for DaVinci.
This pull request adds support for I2C0 and watchdog timer
for DA850 EVM booting using device tree. It also enables
machine reboot when using device tree.
* tag 'davinci-for-v3.9/dt-2' of git://gitorious.org/linux-davinci/linux-davinci:
ARM: davinci: da850 DT: add support for machine reboot
ARM: davinci: da850: add wdt DT node
ARM: davinci: da850: add DT node for I2C0
Diffstat (limited to 'arch/arm/mach-davinci/include')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/da8xx.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h index 1b14aea40310..de439b7b9af1 100644 --- a/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/arch/arm/mach-davinci/include/mach/da8xx.h @@ -110,7 +110,6 @@ extern struct emac_platform_data da8xx_emac_pdata; extern struct da8xx_lcdc_platform_data sharp_lcd035q3dg01_pdata; extern struct da8xx_lcdc_platform_data sharp_lk043t1dg01_pdata; -extern struct platform_device da8xx_wdt_device; extern const short da830_emif25_pins[]; extern const short da830_spi0_pins[]; |
