From b515e4767ffd07d1b14f4dc4f328d75f765215ab Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de>
Date: Wed, 17 Oct 2007 20:24:56 +0200
Subject: [PATCH] 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
---
Reading git-format-patch failed