VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2017-11-14 15:32:19 -0800 committer: Linus Torvalds <torvalds@linux-foundation.org> 2017-11-14 15:32:19 -0800 commit: e2c5923c349c1738fe8fda980874d93f6fb2e5b6 parent: abc36be236358162202e86ad88616ff95a755101

Commit Summary:

Merge branch 'for-4.15/block' of git://git.kernel.dk/linux-block

Diffstat:

1 file changed, 2 insertions, 10 deletions

diff --git a/drivers/cdrom/Makefile b/drivers/cdrom/Makefile
index a95566ff47d3..0f3664b45f48 100644
--- a/drivers/cdrom/Makefile
+++ b/drivers/cdrom/Makefile
@@ -1,14 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
-# Makefile for the kernel cdrom device drivers.
-#
-# 30 Jan 1998, Michael Elizabeth Chastain, <mailto:mec@shout.net>
-# Rewritten to use lists instead of if-statements.
-
-# Each configuration option enables a list of files.
-
-obj-$(CONFIG_BLK_DEV_IDECD)	+=              cdrom.o
-obj-$(CONFIG_BLK_DEV_SR)	+=              cdrom.o
-obj-$(CONFIG_PARIDE_PCD)	+=		cdrom.o
-obj-$(CONFIG_CDROM_PKTCDVD)	+=		cdrom.o
-
-obj-$(CONFIG_GDROM)		+= gdrom.o      cdrom.o
+obj-$(CONFIG_CDROM)	+= cdrom.o
+obj-$(CONFIG_GDROM)	+= gdrom.o