Messages in this thread Patch in this message | | | Date | Thu, 24 Feb 2005 00:35:42 +0900 | From | Yoichi Yuasa <> | Subject | [PATCH 2.6.11-rc4-mm1] mips: fixed confliction types for pcibios_align_resource |
| |
This patch fixes confliction types for pcibios_align_resource.
CC arch/mips/pci/pci.o arch/mips/pci/pci.c:55: error: conflicting types for 'pcibios_align_resource' include/linux/pci.h:729: error: previous declaration of 'pcibios_align_resource' was here make[1]: *** [arch/mips/pci/pci.o] Error 1 make: *** [arch/mips/pci] Error 2
Yoichi
Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
diff -urN -X dontdiff a-orig/arch/mips/pci/pci.c a/arch/mips/pci/pci.c --- a-orig/arch/mips/pci/pci.c Sun Feb 13 12:06:55 2005 +++ a/arch/mips/pci/pci.c Thu Feb 24 00:11:17 2005 @@ -50,8 +50,7 @@ * which might have be mirrored at 0x0100-0x03ff.. */ void -pcibios_align_resource(void *data, struct resource *res, - unsigned long size, unsigned long align) +pcibios_align_resource(void *data, struct resource *res, u64 size, u64 align) { struct pci_dev *dev = data; struct pci_controller *hose = dev->sysdata; - 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/
| |