38 files changed, 15 insertions, 15 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 86fdf33f20..4c3ff695f6 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -28,9 +28,9 @@ FEED_URIS += " \
 #        updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${TARGET_ARCH}/updates"
 
 #SRCDATE = "20060630"
-#SRCDATE_handhelds-pxa-2.6 = "20060622"
-PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.16-hh7"
-PREFERRED_VERSION_handhelds-pxa-2.6_htcuniversal = "2.6.17-hh1+cvs${SRCDATE}"
+#SRCDATE_linux-handhelds-2.6 = "20060622"
+PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh7"
+PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.17-hh1+cvs${SRCDATE}"
 
 PREFERRED_PROVIDER_hostap-modules_ipaq-pxa270 = "hostap-modules"
 
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
index 313db8b765..a2c4a9c10e 100644
--- a/conf/machine/h1910.conf
+++ b/conf/machine/h1910.conf
@@ -18,7 +18,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget"
 #
 # Software/packages selection
 #
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index e3936a794b..cc242dc682 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -24,7 +24,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadge
 #
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 
 MACHINE_EXTRA_RDEPENDS = "mtd-utils h2200-bootloader kernel"
 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 0215d39912..61024584b5 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -13,7 +13,7 @@ TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
-PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"
+PREFERRED_PROVIDER_virtual/kernel_kernel26 = "linux-handhelds-2.6"
 EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p"
 
 ROOT_FLASH_SIZE = "32"
diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf
index 6e6717842d..f2ecbc5883 100644
--- a/conf/machine/h4000.conf
+++ b/conf/machine/h4000.conf
@@ -18,7 +18,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget"
 #
 # Software/packages selection
 #
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf
index 0e9165903b..d2e7306c46 100644
--- a/conf/machine/h5xxx.conf
+++ b/conf/machine/h5xxx.conf
@@ -18,7 +18,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usb
 #
 # Software/packages selection
 #
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p"
 
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 91da071c03..4366cb16df 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -20,7 +20,7 @@ MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscree
 #
 # Software/packages selection
 #
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 XSERVER = "xserver-kdrive-fbdev"
 
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 3067caada9..d43d16fb46 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -22,7 +22,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usb
 #
 # Software/packages selection
 #
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PCMCIA_MANAGER = "pcmciautils"
 MODUTILS = "26"	
 XSERVER = "xserver-kdrive-w100"
diff --git a/conf/machine/include/simpad-2.6.conf b/conf/machine/include/simpad-2.6.conf
index a5f4962c75..45ddac1bec 100644
--- a/conf/machine/include/simpad-2.6.conf
+++ b/conf/machine/include/simpad-2.6.conf
@@ -1,4 +1,4 @@
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "udev module-init-tools"
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index 0b2bef338a..b3db5c8268 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700"
 #use this for a hx47xx ipaq
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 
 #use this for a hx2xxx ipaq
 #PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf
index e5a31ca680..d2cc9b1f49 100644
--- a/conf/machine/magician.conf
+++ b/conf/machine/magician.conf
@@ -22,7 +22,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget"
 #
 # Software/packages selection
 #
-PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 MODUTILS = "26"	
 XSERVER = "xserver-kdrive-fbdev"
 
diff --git a/packages/linux/handhelds-pxa-2.6.inc b/packages/linux/linux-handhelds-2.6.inc
index 5535e91c48..5535e91c48 100644
--- a/packages/linux/handhelds-pxa-2.6.inc
+++ b/packages/linux/linux-handhelds-2.6.inc
diff --git a/packages/linux/handhelds-pxa-2.6/.mtn2git_empty b/packages/linux/linux-handhelds-2.6/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/handhelds-pxa-2.6/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6/.mtn2git_empty
diff --git a/packages/linux/handhelds-pxa-2.6/24-hostap_cs_id.diff b/packages/linux/linux-handhelds-2.6/24-hostap_cs_id.diff
index b90ead9e4f..b90ead9e4f 100644
--- a/packages/linux/handhelds-pxa-2.6/24-hostap_cs_id.diff
+++ b/packages/linux/linux-handhelds-2.6/24-hostap_cs_id.diff
diff --git a/packages/linux/handhelds-pxa-2.6/block-pio.patch b/packages/linux/linux-handhelds-2.6/block-pio.patch
index 294140b6e8..294140b6e8 100644
--- a/packages/linux/handhelds-pxa-2.6/block-pio.patch
+++ b/packages/linux/linux-handhelds-2.6/block-pio.patch
diff --git a/packages/linux/handhelds-pxa-2.6/defconfig b/packages/linux/linux-handhelds-2.6/defconfig
index cd92420627..cd92420627 100644
--- a/packages/linux/handhelds-pxa-2.6/defconfig
+++ b/packages/linux/linux-handhelds-2.6/defconfig
diff --git a/packages/linux/handhelds-pxa-2.6/defconfig-ipaq-pxa-2.6 b/packages/linux/linux-handhelds-2.6/defconfig-ipaq-pxa-2.6
index 0a7d4a6694..0a7d4a6694 100644
--- a/packages/linux/handhelds-pxa-2.6/defconfig-ipaq-pxa-2.6
+++ b/packages/linux/linux-handhelds-2.6/defconfig-ipaq-pxa-2.6
diff --git a/packages/linux/handhelds-pxa-2.6/eabi-enums.patch b/packages/linux/linux-handhelds-2.6/eabi-enums.patch
index 9e5e9ec571..9e5e9ec571 100644
--- a/packages/linux/handhelds-pxa-2.6/eabi-enums.patch
+++ b/packages/linux/linux-handhelds-2.6/eabi-enums.patch
diff --git a/packages/linux/handhelds-pxa-2.6/h2200/.mtn2git_empty b/packages/linux/linux-handhelds-2.6/h2200/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/handhelds-pxa-2.6/h2200/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6/h2200/.mtn2git_empty
diff --git a/packages/linux/handhelds-pxa-2.6/h2200/defconfig b/packages/linux/linux-handhelds-2.6/h2200/defconfig
index 87c94b5f04..87c94b5f04 100644
--- a/packages/linux/handhelds-pxa-2.6/h2200/defconfig
+++ b/packages/linux/linux-handhelds-2.6/h2200/defconfig
diff --git a/packages/linux/handhelds-pxa-2.6/h4000/.mtn2git_empty b/packages/linux/linux-handhelds-2.6/h4000/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/handhelds-pxa-2.6/h4000/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6/h4000/.mtn2git_empty
diff --git a/packages/linux/handhelds-pxa-2.6/h4000/defconfig b/packages/linux/linux-handhelds-2.6/h4000/defconfig
index fa75078717..fa75078717 100644
--- a/packages/linux/handhelds-pxa-2.6/h4000/defconfig
+++ b/packages/linux/linux-handhelds-2.6/h4000/defconfig
diff --git a/packages/linux/handhelds-pxa-2.6/h5xxx/.mtn2git_empty b/packages/linux/linux-handhelds-2.6/h5xxx/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/handhelds-pxa-2.6/h5xxx/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6/h5xxx/.mtn2git_empty
diff --git a/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig b/packages/linux/linux-handhelds-2.6/h5xxx/defconfig
index b3f8f7c100..b3f8f7c100 100644
--- a/packages/linux/handhelds-pxa-2.6/h5xxx/defconfig
+++ b/packages/linux/linux-handhelds-2.6/h5xxx/defconfig
diff --git a/packages/linux/handhelds-pxa-2.6/hrw-pcmcia-ids-r2.patch b/packages/linux/linux-handhelds-2.6/hrw-pcmcia-ids-r2.patch
index 3d5d197920..3d5d197920 100644
--- a/packages/linux/handhelds-pxa-2.6/hrw-pcmcia-ids-r2.patch
+++ b/packages/linux/linux-handhelds-2.6/hrw-pcmcia-ids-r2.patch
diff --git a/packages/linux/handhelds-pxa-2.6/htcuniversal/.mtn2git_empty b/packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/handhelds-pxa-2.6/htcuniversal/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty
diff --git a/packages/linux/handhelds-pxa-2.6/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
index d409f0b3f5..d409f0b3f5 100644
--- a/packages/linux/handhelds-pxa-2.6/htcuniversal/defconfig
+++ b/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
diff --git a/packages/linux/handhelds-pxa-2.6/hx4700/.mtn2git_empty b/packages/linux/linux-handhelds-2.6/hx4700/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/handhelds-pxa-2.6/hx4700/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6/hx4700/.mtn2git_empty
diff --git a/packages/linux/handhelds-pxa-2.6/hx4700/defconfig b/packages/linux/linux-handhelds-2.6/hx4700/defconfig
index 7fadc7ae3a..7fadc7ae3a 100644
--- a/packages/linux/handhelds-pxa-2.6/hx4700/defconfig
+++ b/packages/linux/linux-handhelds-2.6/hx4700/defconfig
diff --git a/packages/linux/handhelds-pxa-2.6/ide_not_removable-r0.patch b/packages/linux/linux-handhelds-2.6/ide_not_removable-r0.patch
index 1938f72829..1938f72829 100644
--- a/packages/linux/handhelds-pxa-2.6/ide_not_removable-r0.patch
+++ b/packages/linux/linux-handhelds-2.6/ide_not_removable-r0.patch
diff --git a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/.mtn2git_empty b/packages/linux/linux-handhelds-2.6/ipaq-pxa270/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6/ipaq-pxa270/.mtn2git_empty
diff --git a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig b/packages/linux/linux-handhelds-2.6/ipaq-pxa270/defconfig
index 7fadc7ae3a..7fadc7ae3a 100644
--- a/packages/linux/handhelds-pxa-2.6/ipaq-pxa270/defconfig
+++ b/packages/linux/linux-handhelds-2.6/ipaq-pxa270/defconfig
diff --git a/packages/linux/handhelds-pxa-2.6/magician/.mtn2git_empty b/packages/linux/linux-handhelds-2.6/magician/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/handhelds-pxa-2.6/magician/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6/magician/.mtn2git_empty
diff --git a/packages/linux/handhelds-pxa-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6/magician/defconfig
index f3cffaa46c..f3cffaa46c 100644
--- a/packages/linux/handhelds-pxa-2.6/magician/defconfig
+++ b/packages/linux/linux-handhelds-2.6/magician/defconfig
diff --git a/packages/linux/handhelds-pxa-2.6/pitre-tls-2651.patch b/packages/linux/linux-handhelds-2.6/pitre-tls-2651.patch
index 5ef318e4ac..5ef318e4ac 100644
--- a/packages/linux/handhelds-pxa-2.6/pitre-tls-2651.patch
+++ b/packages/linux/linux-handhelds-2.6/pitre-tls-2651.patch
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb b/packages/linux/linux-handhelds-2.6_2.6.16-hh5.bb
index a0dc937647..77cebae039 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.16-hh5.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.16-hh5.bb
@@ -3,4 +3,4 @@ DESCRIPTION = "handhelds.org Linux kernel for PXA based devices."
 LICENSE = "GPL"
 PR = "r1"
 
-require handhelds-pxa-2.6.inc
+require linux-handhelds-2.6.inc
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.16-hh7.bb b/packages/linux/linux-handhelds-2.6_2.6.16-hh7.bb
index 5d8864c92e..3e90563db8 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.16-hh7.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.16-hh7.bb
@@ -5,4 +5,4 @@ PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
-require handhelds-pxa-2.6.inc
+require linux-handhelds-2.6.inc
diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb
index e0aeff7c3f..e0aeff7c3f 100644
--- a/packages/linux/handhelds-pxa-2.6_cvs.bb
+++ b/packages/linux/linux-handhelds-2.6_cvs.bb