diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-03-24 08:25:30 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-03-24 07:57:08 -0600 |
| commit | 387048bf67eeff8bdf7c2a41b03b48230a88b3d3 (patch) | |
| tree | f6d6d18d479fd2665d0c10d7aa0ec0a201611135 /block/Makefile | |
| parent | 3f4fc59c1321b74df27dcd5d77b37989ed93265b (diff) | |
| download | linux-stable-387048bf67eeff8bdf7c2a41b03b48230a88b3d3.tar.gz linux-stable-387048bf67eeff8bdf7c2a41b03b48230a88b3d3.tar.bz2 linux-stable-387048bf67eeff8bdf7c2a41b03b48230a88b3d3.zip | |
block: merge partition-generic.c and check.c
Merge block/partition-generic.c and block/partitions/check.c into
a single block/partitions/core.c as the content is closely related
and both files are tiny.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/Makefile')
| -rw-r--r-- | block/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/Makefile b/block/Makefile index 1a43750f4b01..206b96e9387f 100644 --- a/block/Makefile +++ b/block/Makefile @@ -8,8 +8,7 @@ obj-$(CONFIG_BLOCK) := bio.o elevator.o blk-core.o blk-sysfs.o \ blk-exec.o blk-merge.o blk-softirq.o blk-timeout.o \ blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \ blk-mq-sysfs.o blk-mq-cpumap.o blk-mq-sched.o ioctl.o \ - genhd.o partition-generic.o ioprio.o \ - badblocks.o partitions/ blk-rq-qos.o + genhd.o ioprio.o badblocks.o partitions/ blk-rq-qos.o obj-$(CONFIG_BOUNCE) += bounce.o obj-$(CONFIG_BLK_SCSI_REQUEST) += scsi_ioctl.o |