From 2a503d359971e8cf193dbfde3a8f56daa42d66f7 Mon Sep 17 00:00:00 2001
From: Martin Stein <martin.stein@genode-labs.com>
Date: Fri, 28 Feb 2014 17:05:54 +0100
Subject: [PATCH] hw: adjust defines in core/processor_driver/

ref #1083
---
 base-hw/src/core/processor_driver/arm.h        | 6 +++---
 base-hw/src/core/processor_driver/arm_v6.h     | 6 +++---
 base-hw/src/core/processor_driver/arm_v7.h     | 6 +++---
 base-hw/src/core/processor_driver/cortex_a15.h | 6 +++---
 base-hw/src/core/processor_driver/cortex_a8.h  | 6 +++---
 base-hw/src/core/processor_driver/cortex_a9.h  | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/base-hw/src/core/processor_driver/arm.h b/base-hw/src/core/processor_driver/arm.h
index 64e4273d42..1b03e9bd2b 100644
--- a/base-hw/src/core/processor_driver/arm.h
+++ b/base-hw/src/core/processor_driver/arm.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CPU__ARM_H_
-#define _CPU__ARM_H_
+#ifndef _PROCESSOR_DRIVER__ARM_H_
+#define _PROCESSOR_DRIVER__ARM_H_
 
 /* Genode includes */
 #include <util/register.h>
@@ -652,5 +652,5 @@ namespace Arm
 	};
 }
 
-#endif /* _CPU__ARM_H_ */
+#endif /* _PROCESSOR_DRIVER__ARM_H_ */
 
diff --git a/base-hw/src/core/processor_driver/arm_v6.h b/base-hw/src/core/processor_driver/arm_v6.h
index d4f735311f..bb81ba318b 100644
--- a/base-hw/src/core/processor_driver/arm_v6.h
+++ b/base-hw/src/core/processor_driver/arm_v6.h
@@ -12,8 +12,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CPU__ARM_V6_H_
-#define _CPU__ARM_V6_H_
+#ifndef _PROCESSOR_DRIVER__ARM_V6_H_
+#define _PROCESSOR_DRIVER__ARM_V6_H_
 
 /* Genode includes */
 #include <base/printf.h>
@@ -227,5 +227,5 @@ void Arm::Cpu::flush_data_caches()
 }
 
 
-#endif /* _CPU__ARM_V6_H_ */
+#endif /* _PROCESSOR_DRIVER__ARM_V6_H_ */
 
diff --git a/base-hw/src/core/processor_driver/arm_v7.h b/base-hw/src/core/processor_driver/arm_v7.h
index defbd588d0..93ae274f81 100644
--- a/base-hw/src/core/processor_driver/arm_v7.h
+++ b/base-hw/src/core/processor_driver/arm_v7.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CPU__ARM_V7_H_
-#define _CPU__ARM_V7_H_
+#ifndef _PROCESSOR_DRIVER__ARM_V7_H_
+#define _PROCESSOR_DRIVER__ARM_V7_H_
 
 /* core includes */
 #include <processor_driver/arm.h>
@@ -330,5 +330,5 @@ Arm::Cpu::Psr::access_t Arm::Cpu::Psr::init_user_with_trustzone()
 }
 
 
-#endif /* _CPU__ARM_V7_H_ */
+#endif /* _PROCESSOR_DRIVER__ARM_V7_H_ */
 
diff --git a/base-hw/src/core/processor_driver/cortex_a15.h b/base-hw/src/core/processor_driver/cortex_a15.h
index 4b87ff9830..e60917153d 100644
--- a/base-hw/src/core/processor_driver/cortex_a15.h
+++ b/base-hw/src/core/processor_driver/cortex_a15.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CPU__CORTEX_A15_H_
-#define _CPU__CORTEX_A15_H_
+#ifndef _PROCESSOR_DRIVER__CORTEX_A15_H_
+#define _PROCESSOR_DRIVER__CORTEX_A15_H_
 
 /* Genode includes */
 #include <util/register.h>
@@ -40,5 +40,5 @@ namespace Cortex_a15
 	};
 }
 
-#endif /* _CPU__CORTEX_A15_H_ */
+#endif /* _PROCESSOR_DRIVER__CORTEX_A15_H_ */
 
diff --git a/base-hw/src/core/processor_driver/cortex_a8.h b/base-hw/src/core/processor_driver/cortex_a8.h
index ed7cf236c9..bdb85303e0 100644
--- a/base-hw/src/core/processor_driver/cortex_a8.h
+++ b/base-hw/src/core/processor_driver/cortex_a8.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CPU__CORTEX_A8_H_
-#define _CPU__CORTEX_A8_H_
+#ifndef _PROCESSOR_DRIVER__CORTEX_A8_H_
+#define _PROCESSOR_DRIVER__CORTEX_A8_H_
 
 /* core includes */
 #include <processor_driver/arm_v7.h>
@@ -33,5 +33,5 @@ namespace Cortex_a8
 	};
 }
 
-#endif /* _CPU__CORTEX_A8_H_ */
+#endif /* _PROCESSOR_DRIVER__CORTEX_A8_H_ */
 
diff --git a/base-hw/src/core/processor_driver/cortex_a9.h b/base-hw/src/core/processor_driver/cortex_a9.h
index dfa0eedefb..52697bbb7c 100644
--- a/base-hw/src/core/processor_driver/cortex_a9.h
+++ b/base-hw/src/core/processor_driver/cortex_a9.h
@@ -11,8 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _CPU__CORTEX_A9_H_
-#define _CPU__CORTEX_A9_H_
+#ifndef _PROCESSOR_DRIVER__CORTEX_A9_H_
+#define _PROCESSOR_DRIVER__CORTEX_A9_H_
 
 /* core includes */
 #include <processor_driver/arm_v7.h>
@@ -55,5 +55,5 @@ namespace Cortex_a9
 	};
 }
 
-#endif /* _CPU__CORTEX_A9_H_ */
+#endif /* _PROCESSOR_DRIVER__CORTEX_A9_H_ */