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 git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-iop33x
/
iq80332.c
diff --git
a/arch/arm/mach-iop33x/iq80332.c
b/arch/arm/mach-iop33x/iq80332.c
index 96d6f0f3cd215d384348fb18b4add2a66cdc8658..58c81496c6f62e6b31aee42944fdca470c5af9a6 100644
(file)
--- a/
arch/arm/mach-iop33x/iq80332.c
+++ b/
arch/arm/mach-iop33x/iq80332.c
@@
-96,7
+96,8
@@
static struct hw_pci iq80332_pci __initdata = {
static int __init iq80332_pci_init(void)
{
- if (machine_is_iq80332())
+ if ((iop3xx_get_init_atu() == IOP3XX_INIT_ATU_ENABLE) &&
+ machine_is_iq80332())
pci_common_init(&iq80332_pci);
return 0;