From 7d683c85c1a96e643f12be63d52a5456cbad2bf8 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@nvidia.com>
Date: Fri, 25 Mar 2011 18:49:07 -0700
Subject: Merge remote branch 'git-master/android-tegra-2.6.36' into 0112-1120

Conflicts:
	Makefile
	arch/arm/configs/tegra_defconfig
	arch/arm/configs/tegra_whistler_android_defconfig
	arch/arm/mach-tegra/Kconfig
	arch/arm/mach-tegra/Makefile
	arch/arm/mach-tegra/board-ventana-sensors.c
	arch/arm/mach-tegra/board-ventana.c
	arch/arm/mach-tegra/board-whistler-panel.c
	arch/arm/mach-tegra/board-whistler-pinmux.c
	arch/arm/mach-tegra/board-whistler-power.c
	arch/arm/mach-tegra/board-whistler-sensors.c
	arch/arm/mach-tegra/board-whistler.c
	arch/arm/mach-tegra/board-whistler.h
	arch/arm/mach-tegra/clock.c
	arch/arm/mach-tegra/clock.h
	arch/arm/mach-tegra/common.c
	arch/arm/mach-tegra/cpu-tegra.c
	arch/arm/mach-tegra/devices.c
	arch/arm/mach-tegra/devices.h
	arch/arm/mach-tegra/dma.c
	arch/arm/mach-tegra/fuse.c
	arch/arm/mach-tegra/fuse.h
	arch/arm/mach-tegra/headsmp.S
	arch/arm/mach-tegra/include/mach/clk.h
	arch/arm/mach-tegra/include/mach/iomap.h
	arch/arm/mach-tegra/include/mach/system.h
	arch/arm/mach-tegra/irq.c
	arch/arm/mach-tegra/spi_tegra_slave.c
	arch/arm/mach-tegra/suspend.c
	arch/arm/mach-tegra/tegra2_dvfs.c
	arch/arm/mach-tegra/tegra2_emc.c
	arch/arm/mach-tegra/tegra2_emc.h
	arch/arm/tools/mach-types
	arch/x86/kvm/svm.c
	drivers/cpufreq/cpufreq_interactive.c
	drivers/crypto/tegra-aes.c
	drivers/gpio/cs5535-gpio.c
	drivers/hwmon/nct1008.c
	drivers/misc/Makefile
	drivers/net/wireless/p54/p54usb.c
	drivers/regulator/max8907c-regulator.c
	drivers/rtc/rtc-tegra.c
	drivers/usb/gadget/fsl_udc_core.c
	drivers/usb/host/ehci-tegra.c
	drivers/usb/host/xhci-mem.c
	drivers/usb/otg/tegra-otg.c
	drivers/usb/serial/ftdi_sio.c
	drivers/video/tegra/dc/dc.c
	drivers/video/tegra/dc/hdmi.c
	drivers/video/tegra/dc/hdmi.h
	drivers/video/tegra/host/dev.c
	drivers/video/tegra/host/nvhost_channel.c
	drivers/video/tegra/host/nvhost_intr.c
	include/linux/nct1008.h
	net/econet/af_econet.c
	sound/soc/tegra/Kconfig
	sound/soc/tegra/tegra_i2s.c
	sound/soc/tegra/tegra_pcm.c
	sound/soc/tegra/tegra_soc.c
	sound/soc/tegra/tegra_soc.h

Original-Change-Id: I5b39fd8ea2284828e9cb3b5ce4330728e20b1662
Reviewed-on: http://git-master/r/15736
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Tested-by: Scott Williams <scwilliams@nvidia.com>
Original-Change-Id: I71ecd7c4426e7e82500f12d57b85a6bcc417065c

Rebase-Id: R9945861dd28af80344056aaf004f32a543622a15
---
 arch/arm/mach-tegra/board-aruba-sensors.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'arch')

diff --git a/arch/arm/mach-tegra/board-aruba-sensors.c b/arch/arm/mach-tegra/board-aruba-sensors.c
index c50467976621..ef7bbc41df90 100644
--- a/arch/arm/mach-tegra/board-aruba-sensors.c
+++ b/arch/arm/mach-tegra/board-aruba-sensors.c
@@ -20,7 +20,6 @@
 
 #include <linux/i2c.h>
 #include <mach/gpio.h>
-#include <linux/i2c/nct1008.h>
 #include <linux/akm8975.h>
 
 #include "gpio-names.h"
-- 
cgit v1.2.3