From d35703f70a6c0f89bcec1c97801532ab0d1b945f Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Tue, 27 Mar 2007 22:47:11 +0000 Subject: 2007-03-27 Thomas Schwinge Unconditionally use the device driver multiplexing. Suggested by Gianluca Guida . * i386/i386at/dev_hdr.h: Merge into `device/dev_hdr.h' and remove. * i386/i386at/device_emul.h: Rename to `device/device_emul.h'. Adapt all users. * i386/i386at/i386at_ds_routines.c: Merge into `device/ds_routines.c' and remove. * i386/linux/dev/include/linux_emul.h: Remove file. * Makefrag.am (libkernel_a_SOURCES): Add `device/device_emul.h'. * i386/Makefrag.am (libkernel_a_SOURCES): Remove `i386/i386at/dev_hdr.h', `i386/i386at/device_emul.h' and `i386/i386at/i386at_ds_routines.c'. * i386/linux/Makefrag.am (liblinux_a_SOURCES): Remove `i386/linux/dev/include/linux_emul.h'. * dev/dev_hdr.h: Adapt all users of `i386' as if it were always defined. * device/dev_lookup.c: Likewise. * device/ds_routines.c: Likewise. * device/device_init.c (ds_init): Rename to `mach_device_init'. * device/ds_routines.c (ds_init): Likewise. (ds_trap_init): Rename to `mach_device_trap_init'. (mach_device_trap_init): Make it `static'. * linux/dev/glue/block.c: Don't include , but instead include and . * linux/dev/glue/net.c: Don't include , but instead include . * linux/pcmcia-cs/glue/ds.c: Likewise. --- linux/pcmcia-cs/glue/ds.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux/pcmcia-cs/glue/ds.c') 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 . * * This file is part of GNU Mach. @@ -49,7 +49,7 @@ #include #include -#include +#include #include -- cgit v1.2.3