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 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
platforms
/
cell
/
celleb_pci.c
diff --git
a/arch/powerpc/platforms/cell/celleb_pci.c
b/arch/powerpc/platforms/cell/celleb_pci.c
index 173568140a32ec0df09c0269107c1caa7ec035c6..2b98a36ef8fb740ac7b087ff1cb856400af841d3 100644
(file)
--- a/
arch/powerpc/platforms/cell/celleb_pci.c
+++ b/
arch/powerpc/platforms/cell/celleb_pci.c
@@
-454,7
+454,7
@@
static struct celleb_phb_spec celleb_fake_pci_spec __initdata = {
.setup = celleb_setup_fake_pci,
};
-static
struct of_device_id celleb_phb_match[] __initdata
= {
+static
const struct of_device_id celleb_phb_match[] __initconst
= {
{
.name = "pci-pseudo",
.data = &celleb_fake_pci_spec,