Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-drm-fsl-dcu.git] / arch / sh / drivers / pci / ops-sh4.c

diff --git a/arch/sh/drivers/pci/ops-sh4.c b/arch/sh/drivers/pci/ops-sh4.c
index 2d4371009a5eac81a5f4a9f7d04e02b18f9cc819..54232f13e406b01c87a497e9d81375f896ec930a 100644 (file)
--- a/arch/sh/drivers/pci/ops-sh4.c
+++ b/arch/sh/drivers/pci/ops-sh4.c
@@ -162,3 +162,9 @@ char * __init pcibios_setup(char *str)
 
        return str;
 }
+
+int __attribute__((weak)) pci_fixup_pcic(void)
+{
+       /* Nothing to do. */
+       return 0;
+}