diff options
Diffstat (limited to 'include/linux/of_device.h')
| -rw-r--r-- | include/linux/of_device.h | 2 |
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 @@ | |||
| 16 | */ | 16 | */ |
| 17 | #define of_device platform_device | 17 | #define of_device platform_device |
| 18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
| 19 | #include <linux/of_platform.h> /* temporary until merge */ | ||
| 19 | 20 | ||
| 20 | #ifdef CONFIG_OF_DEVICE | 21 | #ifdef CONFIG_OF_DEVICE |
| 21 | #include <linux/device.h> | 22 | #include <linux/device.h> |
| 22 | #include <linux/of.h> | 23 | #include <linux/of.h> |
| 23 | #include <linux/mod_devicetable.h> | 24 | #include <linux/mod_devicetable.h> |
| 24 | #include <asm/of_device.h> | ||
| 25 | 25 | ||
| 26 | #define to_of_device(d) container_of(d, struct of_device, dev) | 26 | #define to_of_device(d) container_of(d, struct of_device, dev) |
| 27 | 27 | ||