aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/Makefile
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-07-15 01:44:51 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-07-15 01:44:51 -0400
commit43d2548bb2ef7e6d753f91468a746784041e522d (patch)
tree77d13fcd48fd998393abb825ec36e2b732684a73 /drivers/char/Makefile
parent585583d95c5660973bc0cf64add517b040acd8a4 (diff)
parent85082fd7cbe3173198aac0eb5e85ab1edcc6352c (diff)
Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build
Manual fixup of: arch/powerpc/Kconfig
Diffstat (limited to 'drivers/char/Makefile')
-rw-r--r--drivers/char/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index d38ac5030763..0e0d12a06462 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -102,7 +102,6 @@ obj-$(CONFIG_TELCLOCK) += tlclk.o
102 102
103obj-$(CONFIG_MWAVE) += mwave/ 103obj-$(CONFIG_MWAVE) += mwave/
104obj-$(CONFIG_AGP) += agp/ 104obj-$(CONFIG_AGP) += agp/
105obj-$(CONFIG_DRM) += drm/
106obj-$(CONFIG_PCMCIA) += pcmcia/ 105obj-$(CONFIG_PCMCIA) += pcmcia/
107obj-$(CONFIG_IPMI_HANDLER) += ipmi/ 106obj-$(CONFIG_IPMI_HANDLER) += ipmi/
108 107