merge of 27992ad903b456bde0a40788a183fd1b84d95beb

     and 45a56df6cfb8cc83a1c1f9896a655ddb77db51bc

7 files changed, 7 insertions, 7 deletions

diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index b4dde3d0e2..1c76ef870b 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -12,7 +12,7 @@
 # Bruno Randolf <bruno.randolf@4g-systems.biz>
 
 INHERIT += "package_ipk debian nylon-mirrors"
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
 
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
index b11e447ea0..3f3b2f916e 100644
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -14,7 +14,7 @@ HANDHELD_MODULES = ""
 BOOTSTRAP_EXTRA_RDEPENDS +=  "apm apmd network-suspend-scripts"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
 
 GUI_MACHINE_CLASS = "smallscreen"
 
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 65cce6ce81..485bb88892 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -5,7 +5,7 @@
 KERNEL ?= "kernel24"
 #KERNEL ?= "kernel26"
 
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
 
 OVERRIDES =. "${KERNEL}:"
 
diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf
index 9ac43d84e9..d4cd4c1d79 100644
--- a/conf/machine/include/handheld-common.conf
+++ b/conf/machine/include/handheld-common.conf
@@ -20,4 +20,4 @@ input uinput \
 BOOTSTRAP_EXTRA_RDEPENDS +=  "${PCMCIA_MANAGER} apm apmd network-suspend-scripts"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils  wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
diff --git a/conf/machine/include/smartphone-common.conf b/conf/machine/include/smartphone-common.conf
index bd5983cdc0..70beba2562 100644
--- a/conf/machine/include/smartphone-common.conf
+++ b/conf/machine/include/smartphone-common.conf
@@ -18,4 +18,4 @@ input uinput \
 BOOTSTRAP_EXTRA_RDEPENDS +=  "apm apmd network-suspend-scripts"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
 
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
diff --git a/conf/machine/include/thinclient-common.conf b/conf/machine/include/thinclient-common.conf
index 4a96b42525..16f7702d91 100644
--- a/conf/machine/include/thinclient-common.conf
+++ b/conf/machine/include/thinclient-common.conf
@@ -16,4 +16,4 @@ input uinput \
 BOOTSTRAP_EXTRA_RDEPENDS +=  "apm"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools ${@linux_module_packages('${THINCLIENT_MODULES}', d)}"
 
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf
index c480cf4ebf..08bb29189d 100755
--- a/conf/machine/netbook-pro.conf
+++ b/conf/machine/netbook-pro.conf
@@ -2,7 +2,7 @@
 #@Name: Psion teklogix netbookpro Platform
 #@DESCRIPTION: Machine configuration for Psion teklogix netbookpro Platformm
 
-INHERIT += "linux_modules"
+INHERIT += "linux-kernel-base"
 
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv5te"