

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/drivers/block/floppy.c |    1 -
 1 files changed, 1 deletion(-)

diff -puN drivers/block/floppy.c~make-acpi_bus_register_driver-consistent-with-pci_register_driver-again-warning-fix drivers/block/floppy.c
--- 25/drivers/block/floppy.c~make-acpi_bus_register_driver-consistent-with-pci_register_driver-again-warning-fix	2004-11-02 00:45:23.552740408 -0800
+++ 25-akpm/drivers/block/floppy.c	2004-11-02 00:45:26.499292464 -0800
@@ -4233,7 +4233,6 @@ static struct kobject *floppy_find(dev_t
 }
 
 #ifdef CONFIG_ACPI
-static int acpi_floppy_registered;
 static int acpi_floppies;
 
 struct region {
_
