aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/of_device.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-06-29 11:15:54 -0600
committerGrant Likely <grant.likely@secretlab.ca>2010-07-24 09:57:52 -0600
commit295960429675e17ec658320ebb24385727032bed (patch)
treea4631bf0a2c209e964e261a471d9584b8db28197 /include/linux/of_device.h
parentof: remove asm/of_platform.h (diff)
downloadlinux-dev-295960429675e17ec658320ebb24385727032bed.tar.xz
linux-dev-295960429675e17ec658320ebb24385727032bed.zip
of: remove asm/of_device.h
It is mostly unused now. Sparc has a few defines left in it, but they can be moved to other headers. Removing this header means that new architectures adding CONFIG_OF support don't need to also add this header file. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/of_device.h')
-rw-r--r--include/linux/of_device.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 8cd1fe7864e3..0f1911994559 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -16,12 +16,12 @@
*/
#define of_device platform_device
#include <linux/platform_device.h>
+#include <linux/of_platform.h> /* temporary until merge */
#ifdef CONFIG_OF_DEVICE
#include <linux/device.h>
#include <linux/of.h>
#include <linux/mod_devicetable.h>
-#include <asm/of_device.h>
#define to_of_device(d) container_of(d, struct of_device, dev)