Merge branch 'master' of git+ssh://openadk.org/git/openadk

mk/modules.mk

@@ -740,7 +740,6 @@ $(eval $(call KMOD_template,BLK_DEV_NBD,blk-dev-nbd,\
 ,20))
 
 $(eval $(call KMOD_template,SCSI,scsi,\
-    $(MODULES_DIR)/kernel/drivers/scsi/scsi_wait_scan \
     $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod \
 ,20))
 

package/dansguardian/Makefile

@@ -20,7 +20,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DANSGUARDIAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+ifeq ($(ADK_LINUX_AVR32),y)
+LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc
+else
 LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc -lgcc_s
+endif
+
 ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
 LIBRARIES+=-lssp
 endif