diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-02-26 20:16:37 +0100 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-02-26 20:16:45 +0100 |
commit | 1ebad7437729d6abbf5308de19161b0574e3451a (patch) | |
tree | 1229a0bfb2bb0093dec05959fd4bbfca557d64c9 /openbsc/src/e1_input.c | |
parent | 36ed8cc4c33e3b69bb0f84f1b5b593ae46aff08f (diff) | |
parent | 140f6e9b12fcb83d161dc1cd8c5d6972ef86fc7c (diff) |
Merge remote branch 'origin/master' into on-waves/mgcp
Conflicts:
openbsc/include/openbsc/Makefile.am
openbsc/src/Makefile.am
Diffstat (limited to 'openbsc/src/e1_input.c')
-rw-r--r-- | openbsc/src/e1_input.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openbsc/src/e1_input.c b/openbsc/src/e1_input.c index c894fe40f..c20359c09 100644 --- a/openbsc/src/e1_input.c +++ b/openbsc/src/e1_input.c @@ -40,18 +40,18 @@ #define PF_ISDN AF_ISDN #endif -#include <openbsc/select.h> -#include <openbsc/msgb.h> +#include <osmocore/select.h> +#include <osmocore/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/e1_input.h> #include <openbsc/abis_nm.h> #include <openbsc/abis_rsl.h> -#include <openbsc/linuxlist.h> +#include <osmocore/linuxlist.h> #include <openbsc/subchan_demux.h> #include <openbsc/trau_frame.h> #include <openbsc/trau_mux.h> -#include <openbsc/talloc.h> +#include <osmocore/talloc.h> #include <openbsc/signal.h> #include <openbsc/misdn.h> |