tree df42b2cb77406e1ce83312410889f9d95133322b
parent a62e7cef1aef9f98bddd92b8f9f8f3c2fb25037b
author Al Viro <viro@www.linux.org.uk> 1114370915 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> 1114370915 -0700

[PATCH] broken dependency for floppy on ARM

(!ARCH_S390 && !M68K && !IA64 && !UML) is obviously always true on ARM.

Intended behaviour for ARM is "absent unless we are on RiscPC or
EBSA285".  So what we want is added && !ARM in the first term - without
it the last part (|| ARCH_RPC || ARCH_EBSA285, that is) doesn't do
anything. 

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>