diff options
| author | Andrei Warkentin <andreiw@motorola.com> | 2010-06-28 17:59:01 -0500 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:34:40 -0800 |
| commit | 4d25a5a887206a8852319250cf01a024704f846b (patch) | |
| tree | 3da7ae6ba1cb2899de428717d68f6a0a507ffdd0 /arch/arm/mach-tegra/devices.h | |
| parent | 34948d61be4f46818c50aa707c7971b69f3506a1 (diff) | |
w1: master: tegra_w1: Adds generic mach-tegra w1 support.
This adds w1 as a device for mach-tegra boards, fixes wrong
OWR I/O base, and changes OWR clock name.
Change-Id: Idffbdbd05f383ce8e423ee301e197e230db4f2f9
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Diffstat (limited to 'arch/arm/mach-tegra/devices.h')
| -rw-r--r-- | arch/arm/mach-tegra/devices.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/devices.h b/arch/arm/mach-tegra/devices.h index 4a7dc0a097d6..47d4cb351ebd 100644 --- a/arch/arm/mach-tegra/devices.h +++ b/arch/arm/mach-tegra/devices.h @@ -1,5 +1,11 @@ /* +<<<<<<< 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> @@ -46,5 +52,6 @@ extern struct platform_device tegra_i2s_device1; extern struct platform_device tegra_i2s_device2; extern struct platform_device tegra_das_device; extern struct platform_device tegra_pcm_device; +extern struct platform_device tegra_w1_device; #endif |