summaryrefslogtreecommitdiffstats
path: root/arch/blackfin/include/asm/ioctl.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-28 21:34:01 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-28 21:34:01 +0200
commit604a2785a8482cad4d63202465133c720db5eda7 (patch)
treee2f510a8a54d7d4443cb52f3a0be46f527ebb779 /arch/blackfin/include/asm/ioctl.h
parentMerge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff)
parentBlackfin arch: Fix PM building on BF52x: No ROTWE on BF52x, add USBWE (diff)
downloadlinux-604a2785a8482cad4d63202465133c720db5eda7.tar.xz
linux-604a2785a8482cad4d63202465133c720db5eda7.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: Blackfin arch: Fix PM building on BF52x: No ROTWE on BF52x, add USBWE Blackfin arch: sram: use 'unsigned long' for irqflags Blackfin arch: let PCI depend on BROKEN Blackfin arch: move include/asm-blackfin header files to arch/blackfin Blackfin arch: fix bug - MPU crashes under stress Blackfin arch: Fix bug - when to rmmod the L1_module, it stucks and then reboot the board. Blackfin arch: dont actually need to muck with EMAC_SYSTAT for BF52x for demuxing Blackfin arch: Add MTD Partitions for MTD_DATAFLASH, increase max SPI SCLK
Diffstat (limited to 'arch/blackfin/include/asm/ioctl.h')
-rw-r--r--arch/blackfin/include/asm/ioctl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/ioctl.h b/arch/blackfin/include/asm/ioctl.h
new file mode 100644
index 000000000000..b279fe06dfe5
--- /dev/null
+++ b/arch/blackfin/include/asm/ioctl.h
@@ -0,0 +1 @@
+#include <asm-generic/ioctl.h>