git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[sfrench/cifs-2.6.git]
/
arch
/
sparc
/
kernel
/
pci_common.c
diff --git
a/arch/sparc/kernel/pci_common.c
b/arch/sparc/kernel/pci_common.c
index 6e3874b64488056ba060e21a57b5796863cd66b3..a6895987fb70254b7db258c2eff6fd65262aba46 100644
(file)
--- a/
arch/sparc/kernel/pci_common.c
+++ b/
arch/sparc/kernel/pci_common.c
@@
-281,7
+281,7
@@
static int sun4v_read_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,
case 4:
*value = ret & 0xffffffff;
break;
- }
;
+ }
return PCIBIOS_SUCCESSFUL;
@@
-456,7
+456,7
@@
void pci_determine_mem_io_space(struct pci_pbm_info *pbm)
default:
break;
- }
;
+ }
}
if (!saw_io || !saw_mem) {