Commit b0d5bc27 authored Jan 26, 2008 by Olof Johansson Committed by Bartlomiej Zolnierkiewicz Jan 26, 2008

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>

parent 151575e4

drivers/ide/ide-probe.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

include/linux/ide.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

Admin message