From 4952af4357cab6221750e5184017170b3becf42d Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Wed, 19 Sep 2012 10:33:40 -0700 Subject: ARM: OMAP2+: Make id.h local This can be local to mach-omap2. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-devkit8000.c | 2 +- arch/arm/mach-omap2/id.c | 2 +- arch/arm/mach-omap2/id.h | 22 ++++++++++++++++++++++ arch/arm/mach-omap2/include/mach/id.h | 22 ---------------------- 4 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 arch/arm/mach-omap2/id.h delete mode 100644 arch/arm/mach-omap2/include/mach/id.h diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index fcd4ed0..7bb8056 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c @@ -32,7 +32,7 @@ #include #include -#include +#include "id.h" #include #include #include diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 6b98a17..cf2362c 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -23,7 +23,7 @@ #include "common.h" -#include +#include "id.h" #include "soc.h" #include "control.h" diff --git a/arch/arm/mach-omap2/id.h b/arch/arm/mach-omap2/id.h new file mode 100644 index 0000000..02ed3aa --- /dev/null +++ b/arch/arm/mach-omap2/id.h @@ -0,0 +1,22 @@ +/* + * OMAP2 CPU identification code + * + * Copyright (C) 2010 Kan-Ru Chen + * + * 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. + */ +#ifndef OMAP2_ARCH_ID_H +#define OMAP2_ARCH_ID_H + +struct omap_die_id { + u32 id_0; + u32 id_1; + u32 id_2; + u32 id_3; +}; + +void omap_get_die_id(struct omap_die_id *odi); + +#endif diff --git a/arch/arm/mach-omap2/include/mach/id.h b/arch/arm/mach-omap2/include/mach/id.h deleted file mode 100644 index 02ed3aa..0000000 --- a/arch/arm/mach-omap2/include/mach/id.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * OMAP2 CPU identification code - * - * Copyright (C) 2010 Kan-Ru Chen - * - * 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. - */ -#ifndef OMAP2_ARCH_ID_H -#define OMAP2_ARCH_ID_H - -struct omap_die_id { - u32 id_0; - u32 id_1; - u32 id_2; - u32 id_3; -}; - -void omap_get_die_id(struct omap_die_id *odi); - -#endif -- cgit v1.1