aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-06-29 12:26:53 -0400
committerGrant Likely <grant.likely@secretlab.ca>2010-07-24 11:57:52 -0400
commit129ac799ad627b1e08382739f9e8cd75d7477fa3 (patch)
tree2c42efc35fbd20546bf8cf06db9716825eb2bda0
parent1ab1d63a85cee2545272f63a7644e9f855cb65d0 (diff)
of: remove asm/of_platform.h
Only thing left in it is of_instantiate_rtc() which can be moved to asm/prom.h on PowerPC and is unused in microblaze. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/microblaze/include/asm/of_platform.h19
-rw-r--r--arch/powerpc/include/asm/of_platform.h16
-rw-r--r--arch/powerpc/include/asm/prom.h2
-rw-r--r--arch/sparc/include/asm/of_platform.h16
-rw-r--r--include/linux/of_platform.h2
5 files changed, 2 insertions, 53 deletions
diff --git a/arch/microblaze/include/asm/of_platform.h b/arch/microblaze/include/asm/of_platform.h
deleted file mode 100644
index 353d8f651e30..000000000000
--- a/arch/microblaze/include/asm/of_platform.h
+++ /dev/null
@@ -1,19 +0,0 @@
1/*
2 * Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
3 * <benh@kernel.crashing.org>
4 *
5 * This program is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU General Public License
7 * as published by the Free Software Foundation; either version
8 * 2 of the License, or (at your option) any later version.
9 */
10
11#ifndef _ASM_MICROBLAZE_OF_PLATFORM_H
12#define _ASM_MICROBLAZE_OF_PLATFORM_H
13
14/* This is just here during the transition */
15#include <linux/of_platform.h>
16
17extern void of_instantiate_rtc(void);
18
19#endif /* _ASM_MICROBLAZE_OF_PLATFORM_H */
diff --git a/arch/powerpc/include/asm/of_platform.h b/arch/powerpc/include/asm/of_platform.h
deleted file mode 100644
index d506aa61db83..000000000000
--- a/arch/powerpc/include/asm/of_platform.h
+++ /dev/null
@@ -1,16 +0,0 @@
1#ifndef _ASM_POWERPC_OF_PLATFORM_H
2#define _ASM_POWERPC_OF_PLATFORM_H
3/*
4 * Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
5 * <benh@kernel.crashing.org>
6 *
7 * This program is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU General Public License
9 * as published by the Free Software Foundation; either version
10 * 2 of the License, or (at your option) any later version.
11 *
12 */
13
14extern void of_instantiate_rtc(void);
15
16#endif /* _ASM_POWERPC_OF_PLATFORM_H */
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h
index f864722679e8..da7dd634e7ce 100644
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@ -117,5 +117,7 @@ extern const void *of_get_mac_address(struct device_node *np);
117struct pci_dev; 117struct pci_dev;
118extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq); 118extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);
119 119
120extern void of_instantiate_rtc(void);
121
120#endif /* __KERNEL__ */ 122#endif /* __KERNEL__ */
121#endif /* _POWERPC_PROM_H */ 123#endif /* _POWERPC_PROM_H */
diff --git a/arch/sparc/include/asm/of_platform.h b/arch/sparc/include/asm/of_platform.h
deleted file mode 100644
index 26540ddfc511..000000000000
--- a/arch/sparc/include/asm/of_platform.h
+++ /dev/null
@@ -1,16 +0,0 @@
1#ifndef ___ASM_SPARC_OF_PLATFORM_H
2#define ___ASM_SPARC_OF_PLATFORM_H
3/*
4 * Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corp.
5 * <benh@kernel.crashing.org>
6 * Modified for Sparc by merging parts of asm/of_device.h
7 * by Stephen Rothwell
8 *
9 * This program is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU General Public License
11 * as published by the Free Software Foundation; either version
12 * 2 of the License, or (at your option) any later version.
13 *
14 */
15
16#endif
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 429513ae8f6e..a79f59bf61a0 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -52,8 +52,6 @@ extern void of_unregister_platform_driver(struct of_platform_driver *drv);
52extern struct of_device *of_device_alloc(struct device_node *np, 52extern struct of_device *of_device_alloc(struct device_node *np,
53 const char *bus_id, 53 const char *bus_id,
54 struct device *parent); 54 struct device *parent);
55#include <asm/of_platform.h>
56
57extern struct of_device *of_find_device_by_node(struct device_node *np); 55extern struct of_device *of_find_device_by_node(struct device_node *np);
58 56
59extern int of_bus_type_init(struct bus_type *bus, const char *name); 57extern int of_bus_type_init(struct bus_type *bus, const char *name);