Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751216AbVI1XKH (ORCPT ); Wed, 28 Sep 2005 19:10:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751217AbVI1XKG (ORCPT ); Wed, 28 Sep 2005 19:10:06 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:19366 "EHLO ZenIV.linux.org.uk") by vger.kernel.org with ESMTP id S1751216AbVI1XKF (ORCPT ); Wed, 28 Sep 2005 19:10:05 -0400 Date: Thu, 29 Sep 2005 00:10:01 +0100 From: Al Viro To: Linus Torvalds Cc: rmk@arm.linux.org.uk, linux-kernel@vger.kernel.org Subject: [PATCH] arm/rpc iomem annotations Message-ID: <20050928231001.GF7992@ftp.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1087 Lines: 28 Signed-off-by: Al Viro ---- diff -urN RC14-rc2-git6-ia64-user/include/asm-arm/arch-rpc/hardware.h RC14-rc2-git6-rpc-iomem/include/asm-arm/arch-rpc/hardware.h --- RC14-rc2-git6-ia64-user/include/asm-arm/arch-rpc/hardware.h 2005-06-17 15:48:29.000000000 -0400 +++ RC14-rc2-git6-rpc-iomem/include/asm-arm/arch-rpc/hardware.h 2005-09-28 13:02:05.000000000 -0400 @@ -15,7 +15,7 @@ #include #ifndef __ASSEMBLY__ -#define IOMEM(x) ((void __iomem *)(x)) +#define IOMEM(x) ((void __iomem *)(unsigned long)(x)) #else #define IOMEM(x) x #endif /* __ASSEMBLY__ */ @@ -52,7 +52,7 @@ /* * IO Addresses */ -#define VIDC_BASE (void __iomem *)0xe0400000 +#define VIDC_BASE IOMEM(0xe0400000) #define EXPMASK_BASE 0xe0360000 #define IOMD_BASE IOMEM(0xe0200000) #define IOC_BASE IOMEM(0xe0200000) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/