From 0463946344ef19dbd2780695899bcb7f7a1b6b74 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Tue, 31 Mar 2009 20:15:01 +0200 Subject: [PATCH] --- yaml --- r: 139407 b: refs/heads/master c: 6041e8fba8b9a9a64bd7402be700b0f1247a9c55 h: refs/heads/master i: 139405: 19705f5f1cfc8ffb9a3e57e7f9ce60ea1132f4ee 139403: c3a885eb2bda5f9c1349af2f9bdd08e76b19311a 139399: a90d359fad17e102bfa07034c919466108974415 139391: 0254053a22d7b40a345d92a428fa46183b922123 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-cd.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 14497f1d4bad..1baa45054cbf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ab6d7451684078bfc4fbabc432f0ef8a809e975 +refs/heads/master: 6041e8fba8b9a9a64bd7402be700b0f1247a9c55 diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c index 19ccadead5e8..9d3150f549fe 100644 --- a/trunk/drivers/ide/ide-cd.c +++ b/trunk/drivers/ide/ide-cd.c @@ -1942,9 +1942,6 @@ static struct block_device_operations idecd_ops = { }; /* module options */ -static char *ignore; -module_param(ignore, charp, 0400); - static unsigned long debug_mask; module_param(debug_mask, ulong, 0644); @@ -1965,15 +1962,6 @@ static int ide_cd_probe(ide_drive_t *drive) if (drive->media != ide_cdrom && drive->media != ide_optical) goto failed; - /* skip drives that we were told to ignore */ - if (ignore != NULL) { - if (strstr(ignore, drive->name)) { - printk(KERN_INFO PFX "ignoring drive %s\n", - drive->name); - goto failed; - } - } - drive->debug_mask = debug_mask; drive->irq_handler = cdrom_newpc_intr;