commit e4174b247090ffc8b98df8c039d11ee906bc232f
author Stephen Boyd <sboyd@codeaurora.org> Tue Sep 20 00:19:43 2011 -0700
committer Stephen Boyd <sboyd@codeaurora.org> Tue Oct 11 11:07:49 2011 -0700
tree 0e4c8822a03e2dc879213bd8fb1e66b364477f10
parent 5ec7cbebdddfffc7972ba3e1aa41e3855f826018

msm: pil: Differentiate header guards

The same header guard is used for peripheral-loader.h and
mach/peripheral-loader.h. This causes problems when a driver
includes both to call pil_get() and to also register the ops in
the first place. Change the msm version to fix compile errors.

Change-Id: I05a484974306f62a2086ed3ff96426ebfc482473
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

arch/arm/mach-msm/peripheral-loader.h

diff --git a/arch/arm/mach-msm/peripheral-loader.h b/arch/arm/mach-msm/peripheral-loader.h
index 7357432..097d9d7 100644
--- a/arch/arm/mach-msm/peripheral-loader.h
+++ b/arch/arm/mach-msm/peripheral-loader.h
@@ -9,8 +9,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#ifndef __MACH_PERIPHERAL_LOADER_H
-#define __MACH_PERIPHERAL_LOADER_H
+#ifndef __MSM_PERIPHERAL_LOADER_H
+#define __MSM_PERIPHERAL_LOADER_H
 
 #include <linux/list.h>
 #include <linux/mutex.h>