Commit bd53afd8 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://gkernel.bkbits.net/misc-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 628505a0 1b09d7af
...@@ -2142,7 +2142,7 @@ static void get_pci_addrs (const struct pci_dev *pdev, ...@@ -2142,7 +2142,7 @@ static void get_pci_addrs (const struct pci_dev *pdev,
} }
static void __devexit cirrusfb_pci_unmap (struct cirrusfb_info *cinfo) static void cirrusfb_pci_unmap (struct cirrusfb_info *cinfo)
{ {
struct pci_dev *pdev = cinfo->pdev; struct pci_dev *pdev = cinfo->pdev;
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment