summaryrefslogtreecommitdiffstats
path: root/drivers/block/aoe/Makefile
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-02-15 10:24:31 +0100
committerJiri Kosina <jkosina@suse.cz>2011-02-15 10:24:31 +0100
commit0a9d59a2461477bd9ed143c01af9df3f8f00fa81 (patch)
treedf997d1cfb0786427a0df1fbd6f0640fa4248cf4 /drivers/block/aoe/Makefile
parentMAINTAINERS: fix sorting (diff)
parentklist: Fix object alignment on 64-bit. (diff)
downloadlinux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.tar.xz
linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.zip
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/block/aoe/Makefile')
-rw-r--r--drivers/block/aoe/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/aoe/Makefile b/drivers/block/aoe/Makefile
index e76d997183c6..06ea82cdf27d 100644
--- a/drivers/block/aoe/Makefile
+++ b/drivers/block/aoe/Makefile
@@ -3,4 +3,4 @@
#
obj-$(CONFIG_ATA_OVER_ETH) += aoe.o
-aoe-objs := aoeblk.o aoechr.o aoecmd.o aoedev.o aoemain.o aoenet.o
+aoe-y := aoeblk.o aoechr.o aoecmd.o aoedev.o aoemain.o aoenet.o