diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/s390/net/ctcm_fsms.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/s390/net/ctcm_fsms.h')
| -rw-r--r-- | drivers/s390/net/ctcm_fsms.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/net/ctcm_fsms.h b/drivers/s390/net/ctcm_fsms.h index 2326aba9807a..046d077fabbb 100644 --- a/drivers/s390/net/ctcm_fsms.h +++ b/drivers/s390/net/ctcm_fsms.h | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <asm/idals.h> | 39 | #include <asm/idals.h> |
| 40 | 40 | ||
| 41 | #include "fsm.h" | 41 | #include "fsm.h" |
| 42 | #include "cu3088.h" | ||
| 43 | #include "ctcm_main.h" | 42 | #include "ctcm_main.h" |
| 44 | 43 | ||
| 45 | /* | 44 | /* |