diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /arch/powerpc/sysdev | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/mpic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index b604926401f5..723972bb5bd9 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
| @@ -339,7 +339,7 @@ static void __init mpic_scan_ht_pic(struct mpic *mpic, u8 __iomem *devbase, | |||
| 339 | for (pos = readb(devbase + PCI_CAPABILITY_LIST); pos != 0; | 339 | for (pos = readb(devbase + PCI_CAPABILITY_LIST); pos != 0; |
| 340 | pos = readb(devbase + pos + PCI_CAP_LIST_NEXT)) { | 340 | pos = readb(devbase + pos + PCI_CAP_LIST_NEXT)) { |
| 341 | u8 id = readb(devbase + pos + PCI_CAP_LIST_ID); | 341 | u8 id = readb(devbase + pos + PCI_CAP_LIST_ID); |
| 342 | if (id == PCI_CAP_ID_HT_IRQCONF) { | 342 | if (id == PCI_CAP_ID_HT) { |
| 343 | id = readb(devbase + pos + 3); | 343 | id = readb(devbase + pos + 3); |
| 344 | if (id == 0x80) | 344 | if (id == 0x80) |
| 345 | break; | 345 | break; |