diff --git a/[refs] b/[refs] index 76057f2f81ff..64a9afb4a758 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 151575e4644f917d3a9f83c777ac3543284954f8 +refs/heads/master: b0d5bc27ce995adaafbc114b92fa76815025c94e diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c index 1af94ac4892a..18e9b82e132c 100644 --- a/trunk/drivers/ide/ide-probe.c +++ b/trunk/drivers/ide/ide-probe.c @@ -1340,7 +1340,7 @@ static void hwif_register_devices(ide_hwif_t *hwif) } } -int ide_device_add_all(u8 idx[MAX_HWIFS]) +int ide_device_add_all(u8 *idx) { ide_hwif_t *hwif; int i, rc = 0; diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h index d7c0f9a8bd9e..ce9b16f38c08 100644 --- a/trunk/include/linux/ide.h +++ b/trunk/include/linux/ide.h @@ -1201,7 +1201,7 @@ void ide_unregister_region(struct gendisk *); void ide_undecoded_slave(ide_drive_t *); -int ide_device_add_all(u8 idx[MAX_HWIFS]); +int ide_device_add_all(u8 *idx); int ide_device_add(u8 idx[4]); static inline void *ide_get_hwifdata (ide_hwif_t * hwif)