Merge mainline v2.6.27-rc2 tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-loki / hardware.h

diff --git a/include/asm-arm/hardware.h b/include/asm-arm/arch-loki/hardware.h
similarity index 51%
rename from include/asm-arm/hardware.h
rename to include/asm-arm/arch-loki/hardware.h
index 1fd1a5b6504ba961468825435fb64a129b84c1d8..f65b01c733b662abd381bc24ccd4342d8adace0c 100644 (file)
--- a/include/asm-arm/hardware.h
+++ b/include/asm-arm/arch-loki/hardware.h
@@ -1,18 +1,15 @@
 /*
- *  linux/include/asm-arm/hardware.h
- *
- *  Copyright (C) 1996 Russell King
+ * include/asm-arm/arch-loki/hardware.h
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
- *  Common hardware definitions
  */
 
-#ifndef __ASM_HARDWARE_H
-#define __ASM_HARDWARE_H
+#ifndef __ASM_ARCH_HARDWARE_H
+#define __ASM_ARCH_HARDWARE_H
+
+#include "loki.h"
 
-#include <asm/arch/hardware.h>
 
 #endif