aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block/Makefile2
-rw-r--r--block/blk-core.c (renamed from block/ll_rw_blk.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/block/Makefile b/block/Makefile
index 826108190f00..75597c1263e0 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -2,7 +2,7 @@
2# Makefile for the kernel block layer 2# Makefile for the kernel block layer
3# 3#
4 4
5obj-$(CONFIG_BLOCK) := elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o 5obj-$(CONFIG_BLOCK) := elevator.o blk-core.o ioctl.o genhd.o scsi_ioctl.o
6 6
7obj-$(CONFIG_BLK_DEV_BSG) += bsg.o 7obj-$(CONFIG_BLK_DEV_BSG) += bsg.o
8obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o 8obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
diff --git a/block/ll_rw_blk.c b/block/blk-core.c
index 1932a56f5e4b..1932a56f5e4b 100644
--- a/block/ll_rw_blk.c
+++ b/block/blk-core.c