Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 54638
b: refs/heads/master
c: 6245672
h: refs/heads/master
v: v3
  • Loading branch information
John Feeney authored and Linus Torvalds committed May 8, 2007
1 parent 1b645f3 commit 6d14164
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e63340ae6b6205fef26b40a75673d1c9c0c8bb90
refs/heads/master: 62456726d715042e1976b830c59fd73f41c4aaa6
13 changes: 2 additions & 11 deletions trunk/drivers/edac/i82875p_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,6 @@ static void i82875p_check(struct mem_ctl_info *mci)
i82875p_process_error_info(mci, &info, 1);
}

#ifdef CONFIG_PROC_FS
extern int pci_proc_attach_device(struct pci_dev *);
#endif

/* Return 0 on success or 1 on failure. */
static int i82875p_setup_overfl_dev(struct pci_dev *pdev,
struct pci_dev **ovrfl_pdev, void __iomem **ovrfl_window)
Expand All @@ -287,17 +283,12 @@ static int i82875p_setup_overfl_dev(struct pci_dev *pdev,

if (dev == NULL)
return 1;

pci_bus_add_device(dev);
}

*ovrfl_pdev = dev;

#ifdef CONFIG_PROC_FS
if ((dev->procent == NULL) && pci_proc_attach_device(dev)) {
i82875p_printk(KERN_ERR, "%s(): Failed to attach overflow "
"device\n", __func__);
return 1;
}
#endif /* CONFIG_PROC_FS */
if (pci_enable_device(dev)) {
i82875p_printk(KERN_ERR, "%s(): Failed to enable overflow "
"device\n", __func__);
Expand Down

0 comments on commit 6d14164

Please sign in to comment.