From b62157ceed7a13ba2f3a6794779497e99805ce6c Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 29 Jan 2008 14:49:21 +0100
Subject: [PATCH] --- yaml --- r: 79551 b: refs/heads/master c:
 a168ee84c90b39ece357da127ab388f2f64db19c h: refs/heads/master i:   79549:
 3aa8985536a7a5d2bf52960da50475ad89b107aa   79547:
 164d2d954bf1e0c83a0d69e5371a29cdda6671eb   79543:
 0eed90a96011e9cff235d08d293debf44c4e76f8   79535:
 609e732a36d551637286e4bcf5d103b56e52b63b   79519:
 e412b47c644465b71ef9c2872dfab59a51026537   79487:
 66bfc7669db9a55a0987813d5bcfb5f390a32301 v: v3

---
 [refs]                                  | 2 +-
 trunk/block/Makefile                    | 2 +-
 trunk/block/{ll_rw_blk.c => blk-core.c} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename trunk/block/{ll_rw_blk.c => blk-core.c} (100%)

diff --git a/[refs] b/[refs]
index 76e2d2718301..dc33e44bd8ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bf722598fcd51073974850ae026b44389430ecc
+refs/heads/master: a168ee84c90b39ece357da127ab388f2f64db19c
diff --git a/trunk/block/Makefile b/trunk/block/Makefile
index 826108190f00..75597c1263e0 100644
--- a/trunk/block/Makefile
+++ b/trunk/block/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the kernel block layer
 #
 
-obj-$(CONFIG_BLOCK) := elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o
+obj-$(CONFIG_BLOCK) := elevator.o blk-core.o ioctl.o genhd.o scsi_ioctl.o
 
 obj-$(CONFIG_BLK_DEV_BSG)	+= bsg.o
 obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o
diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/blk-core.c
similarity index 100%
rename from trunk/block/ll_rw_blk.c
rename to trunk/block/blk-core.c