2013-09-26 18:51:49

by Rob Herring

[permalink] [raw]
Subject: [PATCH 21/21] of: remove empty arch prom.h headers

From: Rob Herring <[email protected]>

Now that prom.h is optional, all the empty prom.h headers can be removed.

Signed-off-by: Rob Herring <[email protected]>
Cc: Vineet Gupta <[email protected]>
Cc: Catalin Marinas <[email protected]>
Cc: Will Deacon <[email protected]>
Cc: Mark Salter <[email protected]>
Cc: Aurelien Jacquiot <[email protected]>
Cc: James Hogan <[email protected]>
Cc: Jonas Bonn <[email protected]>
Cc: Chris Zankel <[email protected]>
Cc: Max Filippov <[email protected]>
---
arch/arc/include/asm/prom.h | 12 ------------
arch/arm64/include/asm/prom.h | 1 -
arch/c6x/include/asm/prom.h | 1 -
arch/metag/include/asm/prom.h | 20 --------------------
arch/openrisc/include/asm/prom.h | 20 --------------------
arch/xtensa/include/asm/prom.h | 4 ----
6 files changed, 58 deletions(-)
delete mode 100644 arch/arc/include/asm/prom.h
delete mode 100644 arch/arm64/include/asm/prom.h
delete mode 100644 arch/c6x/include/asm/prom.h
delete mode 100644 arch/metag/include/asm/prom.h
delete mode 100644 arch/openrisc/include/asm/prom.h
delete mode 100644 arch/xtensa/include/asm/prom.h

diff --git a/arch/arc/include/asm/prom.h b/arch/arc/include/asm/prom.h
deleted file mode 100644
index 1555549..0000000
--- a/arch/arc/include/asm/prom.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright (C) 2012 Synopsys, Inc. (http://www.synopsys.com)
- *
- * 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 _ASM_ARC_PROM_H_
-#define _ASM_ARC_PROM_H_
-
-#endif
diff --git a/arch/arm64/include/asm/prom.h b/arch/arm64/include/asm/prom.h
deleted file mode 100644
index 68b90e6..0000000
--- a/arch/arm64/include/asm/prom.h
+++ /dev/null
@@ -1 +0,0 @@
-/* Empty for now */
diff --git a/arch/c6x/include/asm/prom.h b/arch/c6x/include/asm/prom.h
deleted file mode 100644
index b4ec95f0..0000000
--- a/arch/c6x/include/asm/prom.h
+++ /dev/null
@@ -1 +0,0 @@
-/* dummy prom.h; here to make linux/of.h's #includes happy */
diff --git a/arch/metag/include/asm/prom.h b/arch/metag/include/asm/prom.h
deleted file mode 100644
index d4be144..0000000
--- a/arch/metag/include/asm/prom.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * arch/metag/include/asm/prom.h
- *
- * Copyright (C) 2012 Imagination Technologies Ltd.
- *
- * Based on ARM version:
- * Copyright (C) 2009 Canonical Ltd. <[email protected]>
- *
- * 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 __ASM_METAG_PROM_H
-#define __ASM_METAG_PROM_H
-
-
-extern void copy_fdt(void);
-
-#endif /* __ASM_METAG_PROM_H */
diff --git a/arch/openrisc/include/asm/prom.h b/arch/openrisc/include/asm/prom.h
deleted file mode 100644
index bec477b..0000000
--- a/arch/openrisc/include/asm/prom.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * OpenRISC Linux
- *
- * Linux architectural port borrowing liberally from similar works of
- * others. All original copyrights apply as per the original source
- * declaration.
- *
- * OpenRISC implementation:
- * Copyright (C) 2010-2011 Jonas Bonn <[email protected]>
- * et al.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-#ifndef _ASM_OPENRISC_PROM_H
-#define _ASM_OPENRISC_PROM_H
-
-#endif /* _ASM_OPENRISC_PROM_H */
diff --git a/arch/xtensa/include/asm/prom.h b/arch/xtensa/include/asm/prom.h
deleted file mode 100644
index 2a87a58..0000000
--- a/arch/xtensa/include/asm/prom.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _XTENSA_ASM_PROM_H
-#define _XTENSA_ASM_PROM_H
-
-#endif /* _XTENSA_ASM_PROM_H */
--
1.8.1.2


2013-09-27 04:59:11

by Vineet Gupta

[permalink] [raw]
Subject: Re: [PATCH 21/21] of: remove empty arch prom.h headers

On 09/27/2013 12:21 AM, Rob Herring wrote:
> From: Rob Herring <[email protected]>
>
> Now that prom.h is optional, all the empty prom.h headers can be removed.
>
> Signed-off-by: Rob Herring <[email protected]>

Acked-by: Vineet Gupta <[email protected]>

Thx for the continued cleanup.
-Vineet

2013-09-27 14:38:07

by Catalin Marinas

[permalink] [raw]
Subject: Re: [PATCH 21/21] of: remove empty arch prom.h headers

On Thu, Sep 26, 2013 at 07:50:56PM +0100, Rob Herring wrote:
> From: Rob Herring <[email protected]>
>
> Now that prom.h is optional, all the empty prom.h headers can be removed.
>
> Signed-off-by: Rob Herring <[email protected]>
> Cc: Vineet Gupta <[email protected]>
> Cc: Catalin Marinas <[email protected]>
> Cc: Will Deacon <[email protected]>
> Cc: Mark Salter <[email protected]>
> Cc: Aurelien Jacquiot <[email protected]>
> Cc: James Hogan <[email protected]>
> Cc: Jonas Bonn <[email protected]>
> Cc: Chris Zankel <[email protected]>
> Cc: Max Filippov <[email protected]>

Acked-by: Catalin Marinas <[email protected]>