Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / machdep.h

diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index 6cf1a831f550835692c2d06f63e10b540524adba..71c6e7eb2a266798d56e3c6676d528fa1fa8be3f 100644 (file)
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -218,7 +218,7 @@ struct machdep_calls {
        int  (*pcibios_enable_device_hook)(struct pci_dev *, int initial);
 
        /* Called in indirect_* to avoid touching devices */
-       int (*pci_exclude_device)(unsigned char, unsigned char);
+       int (*pci_exclude_device)(struct pci_controller *, unsigned char, unsigned char);
 
        /* Called at then very end of pcibios_init() */
        void (*pcibios_after_init)(void);