diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/hdreg.h | 9 | ||||
| -rw-r--r-- | include/linux/ide.h | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/include/linux/hdreg.h b/include/linux/hdreg.h index dd54c5a269f1..598827f0ee06 100644 --- a/include/linux/hdreg.h +++ b/include/linux/hdreg.h @@ -331,10 +331,13 @@ enum { #define HDIO_GETGEO_BIG_RAW 0x0331 /* */ #define __NEW_HD_DRIVE_ID -/* structure returned by HDIO_GET_IDENTITY, - * as per ANSI NCITS ATA6 rev.1b spec + +/* + * Structure returned by HDIO_GET_IDENTITY, as per ANSI NCITS ATA6 rev.1b spec. + * + * If you change something here, please remember to update fix_driveid() in + * ide/probe.c. */ -/* if you change something here remember to update ide_fix_driveid() */ struct hd_driveid { unsigned short config; /* lots of obsolete bit flags */ unsigned short cyls; /* Obsolete, "physical" cyls */ diff --git a/include/linux/ide.h b/include/linux/ide.h index 7496206e5026..312560f0c372 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -762,7 +762,6 @@ extern int ide_raw_taskfile(struct ata_device *, struct ata_taskfile *); extern int ide_cmd_ioctl(struct ata_device *drive, unsigned long arg); extern void ide_fix_driveid(struct hd_driveid *id); -extern int ide_driveid_update(struct ata_device *); extern int ide_config_drive_speed(struct ata_device *, byte); extern byte eighty_ninty_three(struct ata_device *); @@ -893,11 +892,14 @@ extern void ide_release_dma(struct ata_channel *); extern int ata_start_dma(struct ata_device *, struct request *rq); extern void ata_init_dma(struct ata_channel *, unsigned long) __init; + #endif +extern void ata_fix_driveid(struct hd_driveid *); + extern spinlock_t ide_lock; -#define DRIVE_LOCK(drive) ((drive)->queue.queue_lock) +#define DRIVE_LOCK(drive) ((drive)->queue.queue_lock) extern int drive_is_ready(struct ata_device *drive); |