parisc: Use generic uapi/asm/resource.h file
authorHelge Deller <deller@gmx.de>
Tue, 29 Apr 2014 14:13:22 +0000 (16:13 +0200)
committerHelge Deller <deller@gmx.de>
Thu, 1 May 2014 17:29:26 +0000 (19:29 +0200)
Signed-off-by: Helge Deller <deller@gmx.de>
arch/parisc/include/uapi/asm/Kbuild
arch/parisc/include/uapi/asm/resource.h [deleted file]

Simple merge
diff --cc arch/parisc/include/uapi/asm/resource.h
Simple merge