From: Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de>
Date: Wed, 17 Oct 2007 18:24:56 +0000 (+0200)
Subject: x86: unify include/asm/floppy_32/64.h
X-Git-Tag: v2.6.24-rc1~476^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b515e4767ffd07d1b14f4dc4f328d75f765215ab;p=pandora-kernel.git

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-diff-tree failed