summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-11-15 21:51:19 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-11-15 21:51:37 +0100
commit8d5d20cefd8cab25e0bd6113f22ef4ad4ee97583 (patch)
tree62120ddb96b7a3f23aeaf634b72960daccf7cf91 /linux
parent9dbc292eed8c9971f4b9e26b30d0e3d65ef9c629 (diff)
genhd: Fix building without IDE drivers
* linux/dev/drivers/block/genhd.c [!CONFIG_BLK_DEV_IDE] (device_setup): Do not call ide_setup.
Diffstat (limited to 'linux')
-rw-r--r--linux/dev/drivers/block/genhd.c7
1 files changed, 5 insertions, 2 deletions
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