summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
Diffstat (limited to 'linux')
-rw-r--r--linux/dev/glue/block.c4
-rw-r--r--linux/dev/glue/net.c3
-rw-r--r--linux/pcmcia-cs/glue/ds.c4
3 files changed, 6 insertions, 5 deletions
diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c
index 48dba7d..c06b5d2 100644
--- a/linux/dev/glue/block.c
+++ b/linux/dev/glue/block.c
@@ -60,8 +60,10 @@
#include <device/device_port.h>
#include <device/disk_status.h>
#include <device/device_reply.user.h>
+#include <device/device_emul.h>
-#include <linux_emul.h>
+/* TODO. This should be fixed to not be i386 specific. */
+#include <i386at/disk.h>
#define MACH_INCLUDE
#include <linux/fs.h>
diff --git a/linux/dev/glue/net.c b/linux/dev/glue/net.c
index 3ba0e0a..1a7a1e6 100644
--- a/linux/dev/glue/net.c
+++ b/linux/dev/glue/net.c
@@ -83,8 +83,7 @@
#include <device/if_hdr.h>
#include <device/net_io.h>
#include <device/device_reply.user.h>
-
-#include <linux_emul.h>
+#include <device/device_emul.h>
#define MACH_INCLUDE
#include <linux/kernel.h>
diff --git a/linux/pcmcia-cs/glue/ds.c b/linux/pcmcia-cs/glue/ds.c
index 0f4e9a2..d0ecac9 100644
--- a/linux/pcmcia-cs/glue/ds.c
+++ b/linux/pcmcia-cs/glue/ds.c
@@ -1,7 +1,7 @@
/*
* pcmcia-socket `device' driver
*
- * Copyright (C) 2006 Free Software Foundation, Inc.
+ * Copyright (C) 2006, 2007 Free Software Foundation, Inc.
* Written by Stefan Siegl <stesie@brokenpipe.de>.
*
* This file is part of GNU Mach.
@@ -49,7 +49,7 @@
#include <device/io_req.h>
#include <device/ds_routines.h>
-#include <i386at/device_emul.h>
+#include <device/device_emul.h>
#include <device/device_reply.user.h>