Merge tag 'stable/for-linus-3.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / message / i2o / Makefile

diff --git a/drivers/message/i2o/Makefile b/drivers/message/i2o/Makefile
index 2c2e39aa1efaf04d8747018369089bc44a0c3b8a..b0982dacfd0ac03fe71ac57e2740cc3599b55fd3 100644 (file)
--- a/drivers/message/i2o/Makefile
+++ b/drivers/message/i2o/Makefile
@@ -5,7 +5,7 @@
 # In the future, some of these should be built conditionally.
 #
 
-i2o_core-y             += iop.o driver.o device.o debug.o pci.o exec-osm.o
+i2o_core-y             += iop.o driver.o device.o debug.o pci.o exec-osm.o memory.o
 i2o_bus-y              += bus-osm.o
 i2o_config-y           += config-osm.o
 obj-$(CONFIG_I2O)      += i2o_core.o