Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[~andy/linux] / drivers / of / Makefile

diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index bdfb5f5d4b06d46d6e05ff2e219cf712328945ef..f232cc98ce00904e9b655c0fd51b6dd5fa3028d4 100644 (file)
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -1,4 +1,5 @@
 obj-y = base.o
+obj-$(CONFIG_OF_FLATTREE) += fdt.o
 obj-$(CONFIG_OF_DEVICE) += device.o platform.o
 obj-$(CONFIG_OF_GPIO)   += gpio.o
 obj-$(CONFIG_OF_I2C)   += of_i2c.o