diff options
| author | Jeff Garzik <jgarzik@mandrakesoft.com> | 2002-09-20 06:36:45 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@mandrakesoft.com> | 2002-09-20 06:36:45 -0400 |
| commit | acc61735f2705551990aeaeb85e0e51399939f00 (patch) | |
| tree | be9de9b8792ac7faf163982a314010e07de3aaf3 /include/linux | |
| parent | 55ad3329dee662c50a51c4107c974bf96995db4a (diff) | |
| parent | 18277e88a38adc9ddc25343e61ed8e7476862bb2 (diff) | |
Merge mandrakesoft.com:/home/jgarzik/repo/linus-2.5
into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 45b772a5d922..ca112e24acdb 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1072,6 +1072,8 @@ typedef struct hwif_s { unsigned highmem : 1; /* can do full 32-bit dma */ unsigned no_dsc : 1; /* 0 default, 1 dsc_overlap disabled */ + struct device gendev; + void *hwif_data; /* extra hwif data */ } ide_hwif_t; @@ -1759,4 +1761,6 @@ extern spinlock_t ide_lock; #define local_irq_set(flags) do { local_save_flags((flags)); local_irq_enable(); } while (0) +extern struct bus_type ide_bus_type; + #endif /* _IDE_H */ |