diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 21:34:47 +0100 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 21:34:47 +0100 |
| commit | 0a0fc0ddbe732779366ab6b1b879f62195e65967 (patch) | |
| tree | 7b42490a676cf39ae0691b6859ecf7fd410f229b /drivers/s390/net/cu3088.c | |
| parent | JFS: make buddy table static (diff) | |
| parent | [SPARC64]: Use compat_sys_futimesat in 32-bit syscall table. (diff) | |
| download | linux-0a0fc0ddbe732779366ab6b1b879f62195e65967.tar.xz linux-0a0fc0ddbe732779366ab6b1b879f62195e65967.zip | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'drivers/s390/net/cu3088.c')
| -rw-r--r-- | drivers/s390/net/cu3088.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/s390/net/cu3088.c b/drivers/s390/net/cu3088.c index 0075894c71db..2014fb7a4881 100644 --- a/drivers/s390/net/cu3088.c +++ b/drivers/s390/net/cu3088.c @@ -1,11 +1,11 @@ /* - * $Id: cu3088.c,v 1.35 2005/03/30 19:28:52 richtera Exp $ + * $Id: cu3088.c,v 1.38 2006/01/12 14:33:09 cohuck Exp $ * * CTC / LCS ccw_device driver * * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, IBM Corporation * Author(s): Arnd Bergmann <arndb@de.ibm.com> - * Cornelia Huck <cohuck@de.ibm.com> + * Cornelia Huck <cornelia.huck@de.ibm.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,6 +27,7 @@ #include <linux/module.h> #include <linux/err.h> +#include <asm/s390_rdev.h> #include <asm/ccwdev.h> #include <asm/ccwgroup.h> |