diff options
| author | Olof Johansson <olof@lixom.net> | 2008-01-26 20:13:05 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 20:13:05 +0100 |
| commit | b0d5bc27ce995adaafbc114b92fa76815025c94e (patch) | |
| tree | ee3cd3336be0cbb32b9b823bac0a051c0e531c04 | |
| parent | 151575e4644f917d3a9f83c777ac3543284954f8 (diff) | |
| download | linux-b0d5bc27ce995adaafbc114b92fa76815025c94e.tar.gz linux-b0d5bc27ce995adaafbc114b92fa76815025c94e.tar.bz2 linux-b0d5bc27ce995adaafbc114b92fa76815025c94e.zip | |
ide: Fix build break caused by "ide: remove ideprobe_init()"
Fix build break of powerpc holly_defconfig:
In file included from arch/powerpc/platforms/embedded6xx/holly.c:24:
include/linux/ide.h:1206: error: 'CONFIG_IDE_MAX_HWIFS' undeclared here (not in a function)
There's no need to have a sized array in the prototype, might as well
turn it into a pointer.
It could probably be argued that large parts of the include file can be
covered under #ifdef CONFIG_IDE, but that's a larger undertaking.
Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| -rw-r--r-- | drivers/ide/ide-probe.c | 2 | ||||
| -rw-r--r-- | include/linux/ide.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 1af94ac4892a..18e9b82e132c 100644 --- a/drivers/ide/ide-probe.c +++ b/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/include/linux/ide.h b/include/linux/ide.h index d7c0f9a8bd9e..ce9b16f38c08 100644 --- a/include/linux/ide.h +++ b/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) |