summaryrefslogtreecommitdiffstats
path: root/arch/um/drivers/ubd_user.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-11-07 21:27:23 +0100
committerTony Lindgren <tony@atomide.com>2011-11-07 21:27:23 +0100
commitd30cc16c8e48368e0518f4975a78711e53e14a0f (patch)
tree26b57f7ab5a963cc3d6c57dff6951bd930875583 /arch/um/drivers/ubd_user.c
parentARM: OMAP2: Fix H4 matrix keyboard warning (diff)
parentARM: OMAP: Fix export.h or module.h includes (diff)
downloadlinux-d30cc16c8e48368e0518f4975a78711e53e14a0f.tar.xz
linux-d30cc16c8e48368e0518f4975a78711e53e14a0f.zip
Merge branch 'fixes-modulesplit' into fixes
Diffstat (limited to 'arch/um/drivers/ubd_user.c')
-rw-r--r--arch/um/drivers/ubd_user.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c
index b591bb9c41dd..007b94d97726 100644
--- a/arch/um/drivers/ubd_user.c
+++ b/arch/um/drivers/ubd_user.c
@@ -16,7 +16,6 @@
#include <sys/mman.h>
#include <sys/param.h>
#include "asm/types.h"
-#include "user.h"
#include "ubd_user.h"
#include "os.h"
#include "cow.h"