From 8d5d20cefd8cab25e0bd6113f22ef4ad4ee97583 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 15 Nov 2020 21:51:19 +0100 Subject: genhd: Fix building without IDE drivers * linux/dev/drivers/block/genhd.c [!CONFIG_BLK_DEV_IDE] (device_setup): Do not call ide_setup. --- linux/dev/drivers/block/genhd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'linux') diff --git a/linux/dev/drivers/block/genhd.c b/linux/dev/drivers/block/genhd.c index 23c1e120..903135c3 100644 --- a/linux/dev/drivers/block/genhd.c +++ b/linux/dev/drivers/block/genhd.c @@ -1021,11 +1021,13 @@ static void setup_dev(struct gendisk *dev) void device_setup(void) { extern void console_map_init(void); - extern char *kernel_cmdline; - char *c, *param, *white; struct gendisk *p; int nr=0; +#ifdef CONFIG_BLK_DEV_IDE + extern char *kernel_cmdline; + char *c, *param, *white; + for (c = kernel_cmdline; c; ) { param = strstr(c, " ide"); @@ -1048,6 +1050,7 @@ void device_setup(void) } } } +#endif #ifndef MACH chr_dev_init(); #endif -- cgit v1.2.3