summaryrefslogtreecommitdiffstats
path: root/include/asm-m32r/fcntl.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-17 09:57:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-17 09:57:17 -0700
commit4dc8ab86e0724642e2f778116de64f4b832d7d94 (patch)
treeba3e1327823ac94dc5d33cb76d8704ea0ad915d7 /include/asm-m32r/fcntl.h
parentb9836e08375d86834edcde45e3628e63db8b9624 (diff)
parent78a49990269a539fc77e9a669d9e74e1dfaec657 (diff)
Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev: m32r: move include/asm-m32r/* to arch/m32r/include/asm/ m32r: move include/asm-m32r headers to arch/m32r/include/asm
Diffstat (limited to 'include/asm-m32r/fcntl.h')
-rw-r--r--include/asm-m32r/fcntl.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-m32r/fcntl.h b/include/asm-m32r/fcntl.h
deleted file mode 100644
index 46ab12db573..00000000000
--- a/include/asm-m32r/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>