diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-18 11:54:43 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-18 11:54:43 +0200 |
| commit | b4ef290d7c3abd1bf8cefcf8def359537fda7f31 (patch) | |
| tree | f3e270923fa36c773eee3bb1f9981aab1711d938 /drivers/s390/cio/blacklist.c | |
| parent | 77b52b4c5c66175553ee59eb43f74366f1e54bde (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linus' into x86/pat
Diffstat (limited to 'drivers/s390/cio/blacklist.c')
| -rw-r--r-- | drivers/s390/cio/blacklist.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c index 9c21b8f43f9b..a4a5f2efea48 100644 --- a/drivers/s390/cio/blacklist.c +++ b/drivers/s390/cio/blacklist.c @@ -19,7 +19,6 @@ #include <asm/cio.h> #include <asm/uaccess.h> -#include <asm/cio.h> #include "blacklist.h" #include "cio.h" |