summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arc/include/asm/prom.h2
-rw-r--r--arch/arm/include/asm/prom.h2
-rw-r--r--arch/metag/include/asm/prom.h1
-rw-r--r--arch/microblaze/include/asm/prom.h2
-rw-r--r--arch/openrisc/include/asm/prom.h2
-rw-r--r--arch/powerpc/include/asm/prom.h2
-rw-r--r--arch/x86/include/asm/prom.h2
-rw-r--r--arch/xtensa/include/asm/prom.h2
-rw-r--r--fs/proc/proc_devtree.c3
9 files changed, 0 insertions, 18 deletions
diff --git a/arch/arc/include/asm/prom.h b/arch/arc/include/asm/prom.h
index 692d0d0789a7..15555499e430 100644
--- a/arch/arc/include/asm/prom.h
+++ b/arch/arc/include/asm/prom.h
@@ -9,6 +9,4 @@
#ifndef _ASM_ARC_PROM_H_
#define _ASM_ARC_PROM_H_
-#define HAVE_ARCH_DEVTREE_FIXUPS
-
#endif
diff --git a/arch/arm/include/asm/prom.h b/arch/arm/include/asm/prom.h
index 4a2985e21969..b681575ad3de 100644
--- a/arch/arm/include/asm/prom.h
+++ b/arch/arm/include/asm/prom.h
@@ -11,8 +11,6 @@
#ifndef __ASMARM_PROM_H
#define __ASMARM_PROM_H
-#define HAVE_ARCH_DEVTREE_FIXUPS
-
#ifdef CONFIG_OF
extern const struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
diff --git a/arch/metag/include/asm/prom.h b/arch/metag/include/asm/prom.h
index e19022c5a0cb..d4be144a8613 100644
--- a/arch/metag/include/asm/prom.h
+++ b/arch/metag/include/asm/prom.h
@@ -14,7 +14,6 @@
#ifndef __ASM_METAG_PROM_H
#define __ASM_METAG_PROM_H
-#define HAVE_ARCH_DEVTREE_FIXUPS
extern void copy_fdt(void);
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h
index 0ebd924902df..2f03ac815851 100644
--- a/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h
@@ -16,8 +16,6 @@
#include <linux/of.h>
-#define HAVE_ARCH_DEVTREE_FIXUPS
-
/* Other Prototypes */
enum early_consoles {
UARTLITE = 1,
diff --git a/arch/openrisc/include/asm/prom.h b/arch/openrisc/include/asm/prom.h
index 93c9980e1b6b..bec477ba9f7d 100644
--- a/arch/openrisc/include/asm/prom.h
+++ b/arch/openrisc/include/asm/prom.h
@@ -17,6 +17,4 @@
#ifndef _ASM_OPENRISC_PROM_H
#define _ASM_OPENRISC_PROM_H
-#define HAVE_ARCH_DEVTREE_FIXUPS
-
#endif /* _ASM_OPENRISC_PROM_H */
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h
index 6707c16d8fc5..43fe0023d722 100644
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@ -20,8 +20,6 @@
#include <asm/irq.h>
#include <linux/atomic.h>
-#define HAVE_ARCH_DEVTREE_FIXUPS
-
/*
* OF address retreival & translation
*/
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h
index 8ef2ec70858f..fbeb06ed0eaa 100644
--- a/arch/x86/include/asm/prom.h
+++ b/arch/x86/include/asm/prom.h
@@ -39,7 +39,5 @@ static inline void x86_dtb_init(void) { }
extern char cmd_line[COMMAND_LINE_SIZE];
-#define HAVE_ARCH_DEVTREE_FIXUPS
-
#endif /* __ASSEMBLY__ */
#endif
diff --git a/arch/xtensa/include/asm/prom.h b/arch/xtensa/include/asm/prom.h
index f3d7cd2c0de7..2a87a583b41b 100644
--- a/arch/xtensa/include/asm/prom.h
+++ b/arch/xtensa/include/asm/prom.h
@@ -1,6 +1,4 @@
#ifndef _XTENSA_ASM_PROM_H
#define _XTENSA_ASM_PROM_H
-#define HAVE_ARCH_DEVTREE_FIXUPS
-
#endif /* _XTENSA_ASM_PROM_H */
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index 106a83570630..70779b2fc209 100644
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -14,16 +14,13 @@
#include <linux/of.h>
#include <linux/export.h>
#include <linux/slab.h>
-#include <asm/prom.h>
#include <asm/uaccess.h>
#include "internal.h"
static inline void set_node_proc_entry(struct device_node *np,
struct proc_dir_entry *de)
{
-#ifdef HAVE_ARCH_DEVTREE_FIXUPS
np->pde = de;
-#endif
}
static struct proc_dir_entry *proc_device_tree;