Merge branch 'kernel-update' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into...

diff --combined make.sh
index a720b627b01c35712a986990efc4664606cc220b,c5f0828952d1ef00fb01b93ee686887151bd3312..da98e2883fb221360680b06fa9a0a79fcc28ddca
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,7 -25,7 +25,7 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.11"                                                        # Version number
 -CORE="57"                                                     # Core Level (Filename)
 +CORE="58"                                                     # Core Level (Filename)
  PAKFIRE_CORE="57"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
@@@ -436,6 -436,9 +436,9 @@@ buildipfire() 
      ipfiremake e1000e                 KCFG=""
      ipfiremake igb                    KCFG=""
    else
+     # arm-omap kernel build
+     ipfiremake linux3                 KCFG="-omap"
+ 
      # arm-versatile kernel build
      ipfiremake linux                  KCFG="-versatile"
      ipfiremake v4l-dvb                        KCFG="-versatile"
@@@ -572,7 -575,6 +575,7 @@@
    ipfiremake Locale-Country
    ipfiremake XML-Parser
    ipfiremake Crypt-PasswdMD5
 +  ipfiremake Net-Telnet
    ipfiremake python-setuptools
    ipfiremake python-clientform
    ipfiremake python-mechanize