ide: merge <asm-sparc/ide_64.h> with <asm-sparc/ide_32.h>
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Mon, 21 Jul 2008 23:55:11 +0000 (16:55 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 21 Jul 2008 23:55:11 +0000 (16:55 -0700)
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/asm-sparc/ide.h
include/asm-sparc/ide_32.h [deleted file]
include/asm-sparc/ide_64.h [deleted file]

Simple merge
diff --cc include/asm-sparc/ide_32.h
Simple merge
diff --cc include/asm-sparc/ide_64.h
Simple merge