Merge branches 'release' and 'ppc-workaround' into release

[linux-2.6] / drivers / uio / Makefile

diff --git a/drivers/uio/Makefile b/drivers/uio/Makefile
index 9b7c83063e15cc7a0809211efe1c0270a227486e..7fecfb459da52d13137e922d04589777416378aa 100644 (file)
--- a/drivers/uio/Makefile
+++ b/drivers/uio/Makefile
@@ -1 +1,2 @@
-obj-$(CONFIG_UIO) += uio.o
+obj-$(CONFIG_UIO)      += uio.o
+obj-$(CONFIG_UIO_CIF)  += uio_cif.o