Froyo AOSP Compile Errors

Compiling 2.2.1 for LG Ally

~15-20min in i get:

external/bluetooth/bluez/src/adapter.c:3064: error: conflicting types for 'adapter_remove_connection'
external/bluetooth/bluez/src/adapter.h:145: note: previous declaration of 'adapter_remove_connection' was here
external/bluetooth/bluez/src/adapter.c: In function 'adapter_remove_connection':
external/bluetooth/bluez/src/adapter.c:3080: error: too many arguments to function 'device_remove_connection'
make: *** [out/target/product/aloha/obj/SHARED_LIBRARIES/libbluetoothd_intermediates/adapter.o] Error 1
make: *** Waiting for unfinished jobs....

Tried:
make installclean
make clean
repo sync
make clobber
make installclean
make clean

make -j3