summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt2009-01-13 03:59:03 +0100
committerBenjamin Herrenschmidt2009-01-13 03:59:03 +0100
commit30aae739a9eb6db31ad7b08dac44bd302f41c709 (patch)
treee57a3e279946e141041adc7244d67d8c77c59e2e /arch/powerpc/platforms
parentasync: fix __lowest_in_progress() (diff)
parentpowerpc/fsl-booke: Remove num_tlbcam_entries (diff)
downloadkernel-qcow2-linux-30aae739a9eb6db31ad7b08dac44bd302f41c709.tar.gz
kernel-qcow2-linux-30aae739a9eb6db31ad7b08dac44bd302f41c709.tar.xz
kernel-qcow2-linux-30aae739a9eb6db31ad7b08dac44bd302f41c709.zip
Merge commit 'kumar/kumar-next' into next
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r--arch/powerpc/platforms/fsl_uli1575.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/fsl_uli1575.c b/arch/powerpc/platforms/fsl_uli1575.c
index 8c619963becc..1db6b9e037fc 100644
--- a/arch/powerpc/platforms/fsl_uli1575.c
+++ b/arch/powerpc/platforms/fsl_uli1575.c
@@ -249,6 +249,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x5288, quirk_uli5288);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x5229, quirk_uli5229);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, 0x5249, quirk_final_uli5249);
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, 0x1575, quirk_final_uli1575);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AL, 0x5229, quirk_uli5229);
static void __devinit hpcd_quirk_uli1575(struct pci_dev *dev)
{