Subject: [merged] omnikey-cardman-4000-pull-in-ioctlh-in-user-header.patch removed from -mm tree
To: vapier@xxxxxxxxxx,laforge@xxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 29 Aug 2013 12:42:57 -0700
The patch titled
Subject: Omnikey Cardman 4000: pull in ioctl.h in user header
has been removed from the -mm tree. Its filename was
omnikey-cardman-4000-pull-in-ioctlh-in-user-header.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Frysinger <vapier@xxxxxxxxxx>
Subject: Omnikey Cardman 4000: pull in ioctl.h in user header
This file uses the ioctl helpers (_IOR/_IOW/etc...), so include ioctl.h
for the definitions.
Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Cc: Harald Welte <laforge@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/uapi/linux/cm4000_cs.h | 1 +
1 file changed, 1 insertion(+)
diff -puN include/uapi/linux/cm4000_cs.h~omnikey-cardman-4000-pull-in-ioctlh-in-user-header include/uapi/linux/cm4000_cs.h
--- a/include/uapi/linux/cm4000_cs.h~omnikey-cardman-4000-pull-in-ioctlh-in-user-header
+++ a/include/uapi/linux/cm4000_cs.h
@@ -2,6 +2,7 @@
#define _UAPI_CM4000_H_
#include <linux/types.h>
+#include <linux/ioctl.h>
#define MAX_ATR 33
_
Patches currently in -mm which might be from vapier@xxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
