Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Revert unintentional and bogus change to drivers/pci/quirks.c
In commit 4e8a5201506423e0241202de1349422af4260296 ("[PKT_SCHED] netem:
Orphan SKB when adding to queue.") Davem mistakenly also included a
temporary diff in his tree that disabled the pci_fixup_video VGA quirk,
which broke sparc64.
This reverts that part of the commit. Sayeth Davem:
"Greg KH has a patch coming to you soon which will move that VGA code
back into x86/x86_64/IA64 specific areas and will fix the sparc64
problem properly."
Special thanks to Claudio Martins <ctpm@ist.utl.pt> for noticing the
error in the first place.
Cc: Claudio Martins <ctpm@ist.utl.pt>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+2
-2
+2
-2
drivers/pci/quirks.c
+2
-2
drivers/pci/quirks.c
···
1634
1634
* is marked here since the boot video device will be the only enabled
1635
1635
* video device at this point.
1636
1636
*/
1637
-
#if 0
1637
+
1638
1638
static void __devinit fixup_video(struct pci_dev *pdev)
1639
1639
{
1640
1640
struct pci_dev *bridge;
···
1663
1663
}
1664
1664
}
1665
1665
DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, fixup_video);
1666
-
#endif
1666
+
1667
1667
1668
1668
static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
1669
1669
{