diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 17:32:00 -0400 |
| commit | 9e3ee1c39c0cc71222f9980ccbf87fe072897eef (patch) | |
| tree | 99462000e6f0d4f907cb2fc690f19d4d441ba0f3 /arch/sh/drivers/pci/pci.c | |
| parent | e56b3bc7942982ac2589c942fb345e38bc7a341a (diff) | |
| parent | f934fb19ef34730263e6afc01e8ec27a8a71470f (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/stop_machine.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/drivers/pci/pci.c')
| -rw-r--r-- | arch/sh/drivers/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index f57095a2617c..d3839e609aac 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c | |||
| @@ -135,7 +135,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) | |||
| 135 | * If we set up a device for bus mastering, we need to check and set | 135 | * If we set up a device for bus mastering, we need to check and set |
| 136 | * the latency timer as it may not be properly set. | 136 | * the latency timer as it may not be properly set. |
| 137 | */ | 137 | */ |
| 138 | unsigned int pcibios_max_latency = 255; | 138 | static unsigned int pcibios_max_latency = 255; |
| 139 | 139 | ||
| 140 | void pcibios_set_master(struct pci_dev *dev) | 140 | void pcibios_set_master(struct pci_dev *dev) |
| 141 | { | 141 | { |