Oops, I forgot to CCed Tony.
sorry.
>
> Patch name: git-tip-fix.patch
> Patch against: mmotm 10 Oct
> Applied after: git-tip.patch
>
> -----------
> git-tip can't build on ia64 because __acpi_unmap_table() function tyep is wrong.
> Then it cause following build error.
>
>
> CC arch/ia64/kernel/acpi.o
> arch/ia64/kernel/acpi.c:180: error: conflicting types for '__acpi_unmap_table'
> include/linux/acpi.h:82: error: previous declaration of '__acpi_unmap_table' was here
> make[1]: *** [arch/ia64/kernel/acpi.o] Error 1
> make: *** [arch/ia64/kernel] Error 2
>
>
> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx>
> CC: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
> CC: Ingo Molnar <mingo@xxxxxxx>
>
> ---
> arch/ia64/kernel/acpi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: b/arch/ia64/kernel/acpi.c
> ===================================================================
> --- a/arch/ia64/kernel/acpi.c
> +++ b/arch/ia64/kernel/acpi.c
> @@ -176,7 +176,7 @@ char *__init __acpi_map_table(unsigned l
> return __va(phys_addr);
> }
>
> -char *__init __acpi_unmap_table(unsigned long virt_addr, unsigned long size)
> +void __init __acpi_unmap_table(char *virt_addr, unsigned long size)
> {
> }
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|