automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@30905 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-30 20:05:55 +00:00
parent 99cf427def
commit 9b23589112

View File

@@ -242,7 +242,7 @@ ifneq ($(shell uname -m),armv4l)
ifneq ($(shell uname -m),sparc64) ifneq ($(shell uname -m),sparc64)
ifneq (${PROC},arm) ifneq (${PROC},arm)
ifneq ($(shell uname -m), parisc) ifneq ($(shell uname -m), parisc)
ifneq ($(shell uname -m), s390) ifneq (${PROC}, s390)
GSM_SOURCES+= $(SRC)/k6opt.s GSM_SOURCES+= $(SRC)/k6opt.s
endif endif
endif endif