merge of 235bdc3ae0f87feaab2e0933bfdb44645a492c5e

     and 2ec546354ed54e5800bc57d56a12bbe7ecb4ccdd

26 files changed, 27 insertions, 27 deletions

diff --git a/packages/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.bb
index 6061c44db3..a19921afa6 100644
--- a/packages/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -1,4 +1,4 @@
 COLLIE_MEMORY_SIZE=24
 COLLIE_RAMDISK_SIZE=8
 
-include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
diff --git a/packages/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.bb
index 93e56d5a03..0b518920f7 100644
--- a/packages/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -1,4 +1,4 @@
 COLLIE_MEMORY_SIZE=32
 COLLIE_RAMDISK_SIZE=0
 
-include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
diff --git a/packages/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.bb
index 66fe16e41c..8ddfdfbead 100644
--- a/packages/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -1,4 +1,4 @@
 COLLIE_MEMORY_SIZE=32
 COLLIE_RAMDISK_SIZE=32
 
-include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
diff --git a/packages/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.bb
index fb4c892f05..d13c82163b 100644
--- a/packages/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -1,4 +1,4 @@
 COLLIE_MEMORY_SIZE=40
 COLLIE_RAMDISK_SIZE=24
 
-include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
diff --git a/packages/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.bb
index 29cc546836..fd4b9ac106 100644
--- a/packages/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -1,4 +1,4 @@
 COLLIE_MEMORY_SIZE=48
 COLLIE_RAMDISK_SIZE=16
 
-include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
diff --git a/packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb
index 8f42d6b383..da7e8b279b 100644
--- a/packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -2,7 +2,7 @@ COLLIE_MEMORY_SIZE=58
 COLLIE_RAMDISK_SIZE=6
 KERNEL_CONSOLE = "tty0"
 
-include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
 
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
diff --git a/packages/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.bb
index ce13c7d2d6..3910d0432f 100644
--- a/packages/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -1,4 +1,4 @@
 COLLIE_MEMORY_SIZE=58
 COLLIE_RAMDISK_SIZE=6
 
-include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
diff --git a/packages/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.bb
index 1aeafb8953..a5f8032932 100644
--- a/packages/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -1,4 +1,4 @@
 COLLIE_MEMORY_SIZE=64
 COLLIE_RAMDISK_SIZE=0
 
-include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
diff --git a/packages/linux/corgi-kernel-2.4-embedix.bb b/packages/linux/corgi-kernel-2.4-embedix.bb
index 81e5063b86..5870ed54b9 100644
--- a/packages/linux/corgi-kernel-2.4-embedix.bb
+++ b/packages/linux/corgi-kernel-2.4-embedix.bb
@@ -1,3 +1,3 @@
 MACHINE = "corgi"
 
-include openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
diff --git a/packages/linux/husky-kernel-2.4-embedix.bb b/packages/linux/husky-kernel-2.4-embedix.bb
index 815a30088f..19645079f1 100644
--- a/packages/linux/husky-kernel-2.4-embedix.bb
+++ b/packages/linux/husky-kernel-2.4-embedix.bb
@@ -1,4 +1,4 @@
 MACHINE = "husky"
 
-include openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
 
diff --git a/packages/linux/ixp4xx-kernel_2.6.15.3.bb b/packages/linux/ixp4xx-kernel_2.6.15.3.bb
index f73b388baa..0af2032537 100644
--- a/packages/linux/ixp4xx-kernel_2.6.15.3.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.15.3.bb
@@ -10,7 +10,7 @@ PR_CONFIG = "0"
 # applied to the kernel.
 PR = "r0.${PR_CONFIG}"
 
-include ixp4xx-kernel.inc
+require ixp4xx-kernel.inc
 
 SRC_URI += "file://defconfig"
 
diff --git a/packages/linux/ixp4xx-kernel_2.6.16.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb
index 008c665cfb..b7354755ef 100644
--- a/packages/linux/ixp4xx-kernel_2.6.16.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.16.bb
@@ -10,7 +10,7 @@ PR_CONFIG = "4"
 # applied to the kernel.
 PR = "r7.${PR_CONFIG}"
 
-include ixp4xx-kernel.inc
+require ixp4xx-kernel.inc
 
 SRC_URI += "file://defconfig"
 
diff --git a/packages/linux/ixp4xx-kernel_2.6.17.bb b/packages/linux/ixp4xx-kernel_2.6.17.bb
index e3500c2e60..9025cca893 100644
--- a/packages/linux/ixp4xx-kernel_2.6.17.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.17.bb
@@ -3,14 +3,14 @@
 # Increment PR_CONFIG for changes to the ixp4xx-kernel specific
 # defconfig (do *NOT* increment anything in here for changes
 # to other kernel configs!)
-PR_CONFIG = "1"
+PR_CONFIG = "2"
 #
 # Increment the number below (i.e. the digits after PR) when
 # making changes within this file or for changes to the patches
 # applied to the kernel.
 PR = "r2.${PR_CONFIG}"
 
-include ixp4xx-kernel.inc
+require ixp4xx-kernel.inc
 
 SRC_URI += "http://svn.nslu2-linux.org/svnroot/kernel/trunk/patches/2.6.17/defconfig"
 
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index 4a667b895f..5c9a5dcfc1 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,4 +1,4 @@
-include linux-openzaurus.inc
+require linux-openzaurus.inc
 
 PR = "r42"
 
diff --git a/packages/linux/linux-openzaurus_2.6.17+git.bb b/packages/linux/linux-openzaurus_2.6.17+git.bb
index 49e188860e..f8fd9432ec 100644
--- a/packages/linux/linux-openzaurus_2.6.17+git.bb
+++ b/packages/linux/linux-openzaurus_2.6.17+git.bb
@@ -1,4 +1,4 @@
-include linux-openzaurus.inc
+require linux-openzaurus.inc
 
 PR = "r8"
 
diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb
index 09855ef5c6..bd30de0562 100644
--- a/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/packages/linux/linux-openzaurus_2.6.17.bb
@@ -1,4 +1,4 @@
-include linux-openzaurus.inc
+require linux-openzaurus.inc
 
 PR = "r15"
 
diff --git a/packages/linux/nslu2-kernel_2.6.14-mm1.bb b/packages/linux/nslu2-kernel_2.6.14-mm1.bb
index ded1e5930d..dff6b0e4b0 100644
--- a/packages/linux/nslu2-kernel_2.6.14-mm1.bb
+++ b/packages/linux/nslu2-kernel_2.6.14-mm1.bb
@@ -10,7 +10,7 @@ PR_CONFIG = "0"
 # applied to the kernel.
 PR = "r1.${PR_CONFIG}"
 
-include nslu2-kernel.inc
+require nslu2-kernel.inc
 
 # N2K_PATCHES - full list of patches to apply
 N2K_PATCHES = "\
diff --git a/packages/linux/nslu2-kernel_2.6.14.5.bb b/packages/linux/nslu2-kernel_2.6.14.5.bb
index 823a8b9b1c..b7790be8be 100644
--- a/packages/linux/nslu2-kernel_2.6.14.5.bb
+++ b/packages/linux/nslu2-kernel_2.6.14.5.bb
@@ -10,7 +10,7 @@ PR_CONFIG = "0"
 # applied to the kernel.
 PR = "r0.${PR_CONFIG}"
 
-include nslu2-kernel.inc
+require nslu2-kernel.inc
 
 # N2K_PATCHES - full list of patches to apply
 N2K_PATCHES = "\
diff --git a/packages/linux/nslu2-kernel_2.6.15.bb b/packages/linux/nslu2-kernel_2.6.15.bb
index 69f545b78a..68b2b56f1a 100644
--- a/packages/linux/nslu2-kernel_2.6.15.bb
+++ b/packages/linux/nslu2-kernel_2.6.15.bb
@@ -10,7 +10,7 @@ PR_CONFIG = "0"
 # applied to the kernel.
 PR = "r3.${PR_CONFIG}"
 
-include nslu2-kernel.inc
+require nslu2-kernel.inc
 
 # N2K_PATCHES - full list of patches to apply
 N2K_PATCHES = "\
diff --git a/packages/linux/opensimpad-64+0_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad-64+0_2.4.25-vrs2-pxa1-jpm1.bb
index fb12c70b59..aab783407e 100644
--- a/packages/linux/opensimpad-64+0_2.4.25-vrs2-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad-64+0_2.4.25-vrs2-pxa1-jpm1.bb
@@ -1,5 +1,5 @@
 SECTION = "kernel"
-include opensimpad_${PV}.bb
+require opensimpad_${PV}.bb
 
 SIMPAD_MEM = "64"
 SIMPAD_RD = "0"
diff --git a/packages/linux/opensimpad-64+0_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad-64+0_2.4.27-vrs1-pxa1-jpm1.bb
index 5bd4c85483..65c5a92621 100644
--- a/packages/linux/opensimpad-64+0_2.4.27-vrs1-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad-64+0_2.4.27-vrs1-pxa1-jpm1.bb
@@ -3,7 +3,7 @@
 # PREFERRED_PROVIDER_virtual/kernel_kernel24 = "opensimpad-64+0"
 
 SECTION = "kernel"
-include opensimpad_${PV}.bb
+require opensimpad_${PV}.bb
 
 # fraction of the memory (in Mb) used for RAM
 SIMPAD_MEM = "64"
diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb
index 303604f074..e94183aa57 100644
--- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb
+++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.bb
@@ -1,2 +1,2 @@
-include openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
 
diff --git a/packages/linux/poodle-kernel-2.4-embedix.bb b/packages/linux/poodle-kernel-2.4-embedix.bb
index 28fa7cc84a..37845c4c96 100644
--- a/packages/linux/poodle-kernel-2.4-embedix.bb
+++ b/packages/linux/poodle-kernel-2.4-embedix.bb
@@ -1,4 +1,4 @@
 MACHINE = "poodle"
 
-include openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
 
diff --git a/packages/linux/poodle255-kernel-2.4-embedix.bb b/packages/linux/poodle255-kernel-2.4-embedix.bb
index 613f785fb6..2b58472185 100644
--- a/packages/linux/poodle255-kernel-2.4-embedix.bb
+++ b/packages/linux/poodle255-kernel-2.4-embedix.bb
@@ -1,4 +1,4 @@
 MACHINE = "poodle255"
 
-include openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
 
diff --git a/packages/linux/shepherd-kernel-2.4-embedix.bb b/packages/linux/shepherd-kernel-2.4-embedix.bb
index bca9245715..e86996d96f 100644
--- a/packages/linux/shepherd-kernel-2.4-embedix.bb
+++ b/packages/linux/shepherd-kernel-2.4-embedix.bb
@@ -1,4 +1,4 @@
 MACHINE = "shepherd"
 
-include openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+require openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
 
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index 6ecfd7d0f2..d9c7f4ed68 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -1,6 +1,6 @@
 SECTION = "kernel"
 
-include nslu2-linksys-kernel_2.4.22.bb
+require nslu2-linksys-kernel_2.4.22.bb
 
 DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device"
 MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>"