diff options
| -rw-r--r-- | drivers/isdn/i4l/isdn_fsm.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/i4l/isdn_net_lib.c | 1 | ||||
| -rw-r--r-- | include/linux/isdn.h | 4 | ||||
| -rw-r--r-- | include/linux/isdn/fsm.h (renamed from drivers/isdn/i4l/isdn_fsm.h) | 0 |
4 files changed, 2 insertions, 5 deletions
diff --git a/drivers/isdn/i4l/isdn_fsm.c b/drivers/isdn/i4l/isdn_fsm.c index 5e453f1edd62..673b3ad9d632 100644 --- a/drivers/isdn/i4l/isdn_fsm.c +++ b/drivers/isdn/i4l/isdn_fsm.c @@ -16,7 +16,7 @@ #include <linux/slab.h> #include <linux/errno.h> #include <linux/string.h> -#include "isdn_fsm.h" +#include <linux/isdn/fsm.h> int fsm_new(struct fsm *fsm) diff --git a/drivers/isdn/i4l/isdn_net_lib.c b/drivers/isdn/i4l/isdn_net_lib.c index 2fcafe906181..8bc24804a21d 100644 --- a/drivers/isdn/i4l/isdn_net_lib.c +++ b/drivers/isdn/i4l/isdn_net_lib.c @@ -56,7 +56,6 @@ #include "isdn_common.h" #include "isdn_net.h" #include "isdn_ppp.h" -#include "isdn_fsm.h" #define ISDN_NET_TX_TIMEOUT (20*HZ) diff --git a/include/linux/isdn.h b/include/linux/isdn.h index 42baf99a835a..5055fbe6b687 100644 --- a/include/linux/isdn.h +++ b/include/linux/isdn.h @@ -14,9 +14,7 @@ #define __ISDN_H__ #include <linux/ioctl.h> - -// FIXME!!! -#include <../drivers/isdn/i4l/isdn_fsm.h> +#include <linux/isdn/fsm.h> #ifdef CONFIG_COBALT_MICRO_SERVER /* Save memory */ diff --git a/drivers/isdn/i4l/isdn_fsm.h b/include/linux/isdn/fsm.h index 95beb142b392..95beb142b392 100644 --- a/drivers/isdn/i4l/isdn_fsm.h +++ b/include/linux/isdn/fsm.h |