projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
[linux-drm-fsl-dcu.git]
/
arch
/
arm
/
mach-ixp4xx
/
ixdp425-pci.c
diff --git
a/arch/arm/mach-ixp4xx/ixdp425-pci.c
b/arch/arm/mach-ixp4xx/ixdp425-pci.c
index d5156c043f0b09094ba5279c651afd52162f9466..4087960048123541411cc472e3413f99f3100398 100644
(file)
--- a/
arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ b/
arch/arm/mach-ixp4xx/ixdp425-pci.c
@@
-66,7
+66,7
@@
struct hw_pci ixdp425_pci __initdata = {
int __init ixdp425_pci_init(void)
{
if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
- machine_is_
avila() || machine_is_ixdp46
5())
+ machine_is_
ixdp465() || machine_is_kixrp43
5())
pci_common_init(&ixdp425_pci);
return 0;
}