Sorry about that, you're right - I got my branches mixed up. 
 

I've been having troubles getting master to compile since the move to osmo-abis.  I have the latest version of osmo-abis (and osmocore) installed, but for some reason I'm getting this:

bts_ericsson_rbs2000.c: In function ‘start_sabm_in_line’:
bts_ericsson_rbs2000.c:73:36: error: ‘struct <anonymous>’ has no member named ‘lapd’
bts_ericsson_rbs2000.c:75:35: error: ‘struct <anonymous>’ has no member named ‘lapd’

If I comment out these lines, I run into the same problem with the Nokias (which I need) as they're trying to send sabms too.

I'm confused why it says its anonymous - when it should be an e1inp_ts. The offending line is:

lapd_sap_start(ts->driver.dahdi.lapd, link->tei, link->sapi);

Looking at e1_input.h from libosmo-abis:
struct e1inp_ts {
...
   struct e1inp_line *line;
   struct lapd_instance *lapd;
...
   union {
...
      struct {
         /* DAHDI driver has one fd for each ts */
         struct osmo_fd fd;
      } dahdi;
...
   } driver;
};

Is this correct?  I don't think I'm including an old non libosmo-abis e1_input.h.

Thanks,
Gus