git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
txx9
/
generic
/
pci.c
diff --git
a/arch/mips/txx9/generic/pci.c
b/arch/mips/txx9/generic/pci.c
index 3c5f1808a4ca9581e37033ebcd8a17dcde8da112..a77698ff2b6f75fb62dd22d8214bf2f957692dc0 100644
(file)
--- a/
arch/mips/txx9/generic/pci.c
+++ b/
arch/mips/txx9/generic/pci.c
@@
-268,7
+268,7
@@
static int txx9_i8259_irq_setup(int irq)
return err;
}
-static void quirk_slc90e66_bridge(struct pci_dev *dev)
+static void
__init_refok
quirk_slc90e66_bridge(struct pci_dev *dev)
{
int irq; /* PCI/ISA Bridge interrupt */
u8 reg_64;