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
ARM: sa1111: provide a generic way to prevent devices from registering
[linux-drm-fsl-dcu.git]
/
arch
/
arm
/
common
/
sa1111.c
diff --git
a/arch/arm/common/sa1111.c
b/arch/arm/common/sa1111.c
index 4bdf1bb283dc800d16228f70ef85c1efa4d2eeca..17694cf64aa6015a6a8470866949a70790596b73 100644
(file)
--- a/
arch/arm/common/sa1111.c
+++ b/
arch/arm/common/sa1111.c
@@
-833,11
+833,8
@@
__sa1111_probe(struct device *me, struct resource *mem, int irq)
g_sa1111 = sachip;
has_devs = ~0;
g_sa1111 = sachip;
has_devs = ~0;
- if (machine_is_assabet() || machine_is_jornada720() ||
- machine_is_badge4())
- has_devs &= ~SA1111_DEVID_PS2_MSE;
- else
- has_devs &= ~SA1111_DEVID_SAC;
+ if (pd)
+ has_devs &= ~pd->disable_devs;
for (i = 0; i < ARRAY_SIZE(sa1111_devices); i++)
if (sa1111_devices[i].devid & has_devs)
for (i = 0; i < ARRAY_SIZE(sa1111_devices); i++)
if (sa1111_devices[i].devid & has_devs)