]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ide: Fix build break caused by "ide: remove ideprobe_init()"
authorOlof Johansson <olof@lixom.net>
Sat, 26 Jan 2008 19:13:05 +0000 (20:13 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 26 Jan 2008 19:13:05 +0000 (20:13 +0100)
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>
drivers/ide/ide-probe.c
include/linux/ide.h

index 1af94ac4892ab5cb76489a3edd2a3ea0fbccfdae..18e9b82e132ccc5a0b844058c18de2664d724b4b 100644 (file)
@@ -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;
index d7c0f9a8bd9e64ee0b5472dac38065db3b43ca63..ce9b16f38c08e8e7ac42b1c58cd787d010e74af1 100644 (file)
@@ -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)