git.openpandora.org
/
pandora-kernel.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://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
bios32.c
diff --git
a/arch/arm/kernel/bios32.c
b/arch/arm/kernel/bios32.c
index
0169917
..
ab19b7c
100644
(file)
--- a/
arch/arm/kernel/bios32.c
+++ b/
arch/arm/kernel/bios32.c
@@
-462,9
+462,6
@@
static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
if (!sys)
panic("PCI: unable to allocate sys data!");
-#ifdef CONFIG_PCI_DOMAINS
- sys->domain = hw->domain;
-#endif
#ifdef CONFIG_PCI_MSI
sys->msi_ctrl = hw->msi_ctrl;
#endif