---

yaml --- r: 373942 b: refs/heads/master c: 8d7297b h: refs/heads/master v: v3
git-mirror · Apr 11, 2013 · 5139f18 · 5139f18
1 parent 9c7a7de
commit 5139f18
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe0cd96c009b14cc85d41a97f84a6453e4bbfd7f
+refs/heads/master: 8d7297b48d6d76f1cb077f87735c7d912f82e8cc
diff --git a/trunk/drivers/bus/mvebu-mbus.c b/trunk/drivers/bus/mvebu-mbus.c
@@ -626,7 +626,7 @@ static const struct mvebu_mbus_soc_data armada_xp_mbus_data = {
 
 static const struct mvebu_mbus_mapping kirkwood_map[] = {
 	MAPDEF("pcie0.0", 4, 0xe0, MAPDEF_PCIMASK),
-	MAPDEF("pcie1.0", 8, 0xe0, MAPDEF_PCIMASK),
+	MAPDEF("pcie1.0", 4, 0xd0, MAPDEF_PCIMASK),
 	MAPDEF("sram",    3, 0x01, MAPDEF_NOMASK),
 	MAPDEF("nand",    1, 0x2f, MAPDEF_NOMASK),
 	{},