Revert unintentional and bogus change to drivers/pci/quirks.c
In commit 4e8a520150
("[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>
This commit is contained in:
Родитель
04fed361da
Коммит
0c0e4668e0
|
@ -1634,7 +1634,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1
|
|||
* is marked here since the boot video device will be the only enabled
|
||||
* video device at this point.
|
||||
*/
|
||||
#if 0
|
||||
|
||||
static void __devinit fixup_video(struct pci_dev *pdev)
|
||||
{
|
||||
struct pci_dev *bridge;
|
||||
|
@ -1663,7 +1663,7 @@ static void __devinit fixup_video(struct pci_dev *pdev)
|
|||
}
|
||||
}
|
||||
DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, fixup_video);
|
||||
#endif
|
||||
|
||||
|
||||
static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче