Merge bk://kernel.bkbits.net/jgarzik/libata-upstream-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://kernel.bkbits.net/jgarzik/libata-upstream-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
e792534a · Linus Torvalds · 4f7f5c5d · bd53afd8 · e792534a · e792534a
Commit e792534a authored Jul 28, 2004 by Linus Torvalds
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 119 additions and 83 deletions

drivers/video/cirrusfb.c drivers/video/cirrusfb.c +1 -1

sound/oss/i810_audio.c sound/oss/i810_audio.c +118 -82

No files found.
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -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;


--- a/sound/oss/i810_audio.c
+++ b/sound/oss/i810_audio.c