From d366717b87e22118f822b04de0ab1356a3e26387 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Mon, 27 Aug 2012 14:50:17 -0700
Subject: [PATCH] --- yaml --- r: 326948 b: refs/heads/master c:
 7ff95aeb017b2cee511c10cf6a50e312ab3b1720 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/arm/mach-tegra/dma.c                 | 1 -
 trunk/arch/arm/mach-tegra/tegra20_clocks.c      | 1 -
 trunk/arch/arm/mach-tegra/tegra20_clocks_data.c | 1 -
 trunk/arch/arm/mach-tegra/timer.c               | 1 -
 trunk/drivers/usb/phy/tegra_usb_phy.c           | 1 -
 6 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f718f58e850a..c1f4b3a60256 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bab53ce38e8735519aa3cfdcc5bfa438c0891086
+refs/heads/master: 7ff95aeb017b2cee511c10cf6a50e312ab3b1720
diff --git a/trunk/arch/arm/mach-tegra/dma.c b/trunk/arch/arm/mach-tegra/dma.c
index 29c5114d607c..7f2732039d24 100644
--- a/trunk/arch/arm/mach-tegra/dma.c
+++ b/trunk/arch/arm/mach-tegra/dma.c
@@ -31,7 +31,6 @@
 #include <mach/dma.h>
 #include <mach/irqs.h>
 #include <mach/iomap.h>
-#include <mach/suspend.h>
 
 #include "apbio.h"
 
diff --git a/trunk/arch/arm/mach-tegra/tegra20_clocks.c b/trunk/arch/arm/mach-tegra/tegra20_clocks.c
index 840ab262272a..5dbc32df261f 100644
--- a/trunk/arch/arm/mach-tegra/tegra20_clocks.c
+++ b/trunk/arch/arm/mach-tegra/tegra20_clocks.c
@@ -28,7 +28,6 @@
 #include <linux/clk.h>
 
 #include <mach/iomap.h>
-#include <mach/suspend.h>
 
 #include "clock.h"
 #include "fuse.h"
diff --git a/trunk/arch/arm/mach-tegra/tegra20_clocks_data.c b/trunk/arch/arm/mach-tegra/tegra20_clocks_data.c
index 1a35c003fba8..c9e31c981a36 100644
--- a/trunk/arch/arm/mach-tegra/tegra20_clocks_data.c
+++ b/trunk/arch/arm/mach-tegra/tegra20_clocks_data.c
@@ -28,7 +28,6 @@
 #include <linux/clk.h>
 
 #include <mach/iomap.h>
-#include <mach/suspend.h>
 
 #include "clock.h"
 #include "fuse.h"
diff --git a/trunk/arch/arm/mach-tegra/timer.c b/trunk/arch/arm/mach-tegra/timer.c
index 57b5bdc13b9b..eccdce983043 100644
--- a/trunk/arch/arm/mach-tegra/timer.c
+++ b/trunk/arch/arm/mach-tegra/timer.c
@@ -33,7 +33,6 @@
 
 #include <mach/iomap.h>
 #include <mach/irqs.h>
-#include <mach/suspend.h>
 
 #include "board.h"
 #include "clock.h"
diff --git a/trunk/drivers/usb/phy/tegra_usb_phy.c b/trunk/drivers/usb/phy/tegra_usb_phy.c
index 4739903245e8..987116f9efcd 100644
--- a/trunk/drivers/usb/phy/tegra_usb_phy.c
+++ b/trunk/drivers/usb/phy/tegra_usb_phy.c
@@ -28,7 +28,6 @@
 #include <linux/usb/otg.h>
 #include <linux/usb/ulpi.h>
 #include <asm/mach-types.h>
-#include <mach/gpio-tegra.h>
 #include <linux/usb/tegra_usb_phy.h>
 #include <mach/iomap.h>