diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 08:09:09 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 08:09:09 -0700 |
| commit | 0ccd8c39bc664bf5e9fcc26caad50cc17ff866d1 (patch) | |
| tree | 29cec0edf3acf18c6978b750a8d6560f445df6df /include/asm-blackfin/ioctl.h | |
| parent | 1625324d22409e32e3f8eb86018cad72e1c09d61 (diff) | |
| parent | ec0c15afb41fd9ad45b53468b60db50170e22346 (diff) | |
Merge branch 'linus' into x86/core
Diffstat (limited to 'include/asm-blackfin/ioctl.h')
| -rw-r--r-- | include/asm-blackfin/ioctl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-blackfin/ioctl.h b/include/asm-blackfin/ioctl.h deleted file mode 100644 index b279fe06dfe..00000000000 --- a/include/asm-blackfin/ioctl.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/ioctl.h> |