diff options
| author | Gary King <gking@nvidia.com> | 2010-08-26 20:00:29 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:35:27 -0800 |
| commit | c10bade1acd015b62e3dc1fe44e4895c449f5e9a (patch) | |
| tree | a6837e8951dce0f5f34510164d1e78fa2801a92c /arch/arm/mach-tegra/devices.h | |
| parent | b92aab3e1dbe9db117802db1eeb889053af8ba42 (diff) | |
[ARM] tegra: add tegra_wdt_device to devices.c
Change-Id: I8098fa38ebef8636a6eeb1179e679201445e5237
Signed-off-by: Gary King <gking@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/devices.h')
| -rw-r--r-- | arch/arm/mach-tegra/devices.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/devices.h b/arch/arm/mach-tegra/devices.h index 3e760670957e..e0906a6736ca 100644 --- a/arch/arm/mach-tegra/devices.h +++ b/arch/arm/mach-tegra/devices.h @@ -1,11 +1,5 @@ /* -<<<<<<< HEAD * Copyright (C) 2010,2011 Google, Inc. -======= - * arch/arm/mach-tegra/devices.h - * - * Copyright (C) 2010 Google, Inc. ->>>>>>> w1: master: tegra_w1: Adds generic mach-tegra w1 support. * * Author: * Colin Cross <ccross@android.com> @@ -60,5 +54,5 @@ extern struct platform_device tegra_ehci3_device; extern struct platform_device tegra_i2s_device1; extern struct platform_device tegra_i2s_device2; extern struct platform_device tegra_gart_device; - +extern struct platform_device tegra_wdt_device; #endif |