Merge branch 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / include / asm-m68knommu / ioctl.h

diff --git a/include/asm-m68knommu/ioctl.h b/include/asm-m68knommu/ioctl.h
index cff72f33350fc2b6033fbb39d103a39de8c0d9ee..b279fe06dfe5bea925eccf4b39c8908b23379b6a 100644 (file)
--- a/include/asm-m68knommu/ioctl.h
+++ b/include/asm-m68knommu/ioctl.h
@@ -1 +1 @@
-#include <asm-m68k/ioctl.h>
+#include <asm-generic/ioctl.h>