x86: unify include/asm/floppy_32/64.h

Same file, except for whitespace, comment formatting and:

32-bit: if((unsigned int) addr >= (unsigned int) high_memory)
64-bit: if((unsigned long) addr >= (unsigned long) high_memory)

where the latter can be used safely for both.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Conflicts:
	include/asm-x86/floppy_32.h
	include/asm-x86/floppy_64.h

diff --cc include/asm-x86/floppy.h
Simple merge

diff --cc include/asm-x86/floppy_32.h
Simple merge

diff --cc include/asm-x86/floppy_64.h
Simple merge