lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from Linus' tree

Browse Source
This commit is contained in:
Paul Mackerras
2005-10-12 14:43:32 +10:00
parent 3a5f8c5f78 da64c6ee6b
commit b6ec995a21
626 changed files with 23967 additions and 4613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/platforms/pseries/pci.c
View File

@@ -31,7 +31,7 @@
#include <asm/prom.h>
#include <asm/ppc-pci.h>
static int __initdata s7a_workaround = -1;
static int __devinitdata s7a_workaround = -1;
#if 0
void pcibios_name_device(struct pci_dev *dev)
@@ -59,7 +59,7 @@ void pcibios_name_device(struct pci_dev *dev)
DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_name_device);
#endif
static void __init check_s7a(void)
static void __devinit check_s7a(void)
{
struct device_node *root;
char *model;