diff options
author | Rob Herring <rob.herring@calxeda.com> | 2013-04-19 18:32:52 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2013-06-12 07:37:40 -0400 |
commit | ba166e900b502b74b9425881caa94f94891b0a1f (patch) | |
tree | 6576c70c8a97bb21876320fc264c7ed8d9e7238d /drivers/of | |
parent | 8973ba8b325f8c084815a3021c427c6fa3017a5d (diff) |
of: remove CONFIG_OF_DEVICE
CONFIG_OF_DEVICE is always selected when CONFIG_OF is enabled, so remove
it and simplify of_platform.h and of_device.h headers. This also fixes
!OF compiles using of_platform_populate.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'drivers/of')
-rw-r--r-- | drivers/of/Kconfig | 3 | ||||
-rw-r--r-- | drivers/of/Makefile | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index d37bfcf5a3a2..80e5c13b930d 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig | |||
@@ -48,9 +48,6 @@ config OF_IRQ | |||
48 | def_bool y | 48 | def_bool y |
49 | depends on !SPARC | 49 | depends on !SPARC |
50 | 50 | ||
51 | config OF_DEVICE | ||
52 | def_bool y | ||
53 | |||
54 | config OF_I2C | 51 | config OF_I2C |
55 | def_tristate I2C | 52 | def_tristate I2C |
56 | depends on I2C | 53 | depends on I2C |
diff --git a/drivers/of/Makefile b/drivers/of/Makefile index e027f444d10c..1f9c0c492ef9 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile | |||
@@ -1,9 +1,8 @@ | |||
1 | obj-y = base.o | 1 | obj-y = base.o device.o platform.o |
2 | obj-$(CONFIG_OF_FLATTREE) += fdt.o | 2 | obj-$(CONFIG_OF_FLATTREE) += fdt.o |
3 | obj-$(CONFIG_OF_PROMTREE) += pdt.o | 3 | obj-$(CONFIG_OF_PROMTREE) += pdt.o |
4 | obj-$(CONFIG_OF_ADDRESS) += address.o | 4 | obj-$(CONFIG_OF_ADDRESS) += address.o |
5 | obj-$(CONFIG_OF_IRQ) += irq.o | 5 | obj-$(CONFIG_OF_IRQ) += irq.o |
6 | obj-$(CONFIG_OF_DEVICE) += device.o platform.o | ||
7 | obj-$(CONFIG_OF_I2C) += of_i2c.o | 6 | obj-$(CONFIG_OF_I2C) += of_i2c.o |
8 | obj-$(CONFIG_OF_NET) += of_net.o | 7 | obj-$(CONFIG_OF_NET) += of_net.o |
9 | obj-$(CONFIG_OF_SELFTEST) += selftest.o | 8 | obj-$(CONFIG_OF_SELFTEST) += selftest.o |