diff options
| author | Jesse Barnes <jbarnes@hobbes.lan> | 2008-06-12 21:06:58 +0200 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-06-12 21:06:58 +0200 |
| commit | 53eb2fbeb9e68e1a9a23945de8450999c46270ce (patch) | |
| tree | 3c50f8690f63b53b3cffbcc226cbbe3c8c6de753 /drivers/ide/legacy/gayle.c | |
| parent | PCI: ACPI PCI slot detection driver (diff) | |
| parent | ACPI PM: Remove obsolete Toshiba workaround (diff) | |
| download | linux-53eb2fbeb9e68e1a9a23945de8450999c46270ce.tar.xz linux-53eb2fbeb9e68e1a9a23945de8450999c46270ce.zip | |
Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 into linux-next
Diffstat (limited to 'drivers/ide/legacy/gayle.c')
| -rw-r--r-- | drivers/ide/legacy/gayle.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c index a9c2593a898c..fed7d812761c 100644 --- a/drivers/ide/legacy/gayle.c +++ b/drivers/ide/legacy/gayle.c @@ -16,6 +16,7 @@ #include <linux/ide.h> #include <linux/init.h> #include <linux/zorro.h> +#include <linux/module.h> #include <asm/setup.h> #include <asm/amigahw.h> @@ -62,7 +63,10 @@ GAYLE_NUM_HWIFS-1) #define GAYLE_HAS_CONTROL_REG (!ide_doubler) #define GAYLE_IDEREG_SIZE (ide_doubler ? 0x1000 : 0x2000) + int ide_doubler = 0; /* support IDE doublers? */ +EXPORT_SYMBOL_GPL(ide_doubler); + module_param_named(doubler, ide_doubler, bool, 0); MODULE_PARM_DESC(doubler, "enable support for IDE doublers"); #endif /* CONFIG_BLK_DEV_IDEDOUBLER */ @@ -112,6 +116,8 @@ static void __init gayle_setup_ports(hw_regs_t *hw, unsigned long base, hw->irq = IRQ_AMIGA_PORTS; hw->ack_intr = ack_intr; + + hw->chipset = ide_generic; } /* |