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_mpc.c | |
| 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_mpc.c')
| -rw-r--r-- | drivers/s390/net/ctcm_mpc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c index 781e18be7e8f..5978b390153f 100644 --- a/drivers/s390/net/ctcm_mpc.c +++ b/drivers/s390/net/ctcm_mpc.c | |||
| @@ -53,7 +53,6 @@ | |||
| 53 | #include <linux/moduleparam.h> | 53 | #include <linux/moduleparam.h> |
| 54 | #include <asm/idals.h> | 54 | #include <asm/idals.h> |
| 55 | 55 | ||
| 56 | #include "cu3088.h" | ||
| 57 | #include "ctcm_mpc.h" | 56 | #include "ctcm_mpc.h" |
| 58 | #include "ctcm_main.h" | 57 | #include "ctcm_main.h" |
| 59 | #include "ctcm_fsms.h" | 58 | #include "ctcm_fsms.h" |