106 files changed, 10 insertions, 10 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index d763a771dd..a4415fd83b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -93,7 +93,7 @@ Machines:   collie, spitz, tosa
 Distros:    OpenZaurus, celinux-test
 Interests:  WiFi, Opie, Qtopia fonts, Native SDK
 Recipes:    hostap*, orinoco*, wpa-supplicant*, wireless-tools, keymaps
-Recipes:    linux-openzaurus, kdepimpi, subapplet, corsair, gammu, iqnotes, zbedic
+Recipes:    linux-rp, kdepimpi, subapplet, corsair, gammu, iqnotes, zbedic
 Recipes:    ttf-fonts/* qpf-fonts/*
 
 Person:     Michael 'Mickey' Lauer
@@ -121,7 +121,7 @@ Mail:       rpurdie@rpsys.net
 Distros:    poky, openzaurus, Ångström
 Machines:   poodle, c7x0, spitz, nokia770, qemuarm, qemux86, hx2xxx
 Interests:  Kernels, Bitbake, Core OE infrastructure, Zaurus 2.6
-Recipes:    linux-openzaurus, udev, zaurusd, task-base
+Recipes:    linux-rp, udev, zaurusd, task-base
 
 Person:	    Rolf 'Laibsch' Leggewie
 Mail:       OE-recipes@rolf.leggewie.biz
diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf
index 15f3258526..48a4bbf3e5 100644
--- a/conf/machine/hx2000.conf
+++ b/conf/machine/hx2000.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa ipaq-pxa270"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf
index d76174bde5..7a5b90e68e 100644
--- a/conf/machine/include/zaurus-2.6.conf
+++ b/conf/machine/include/zaurus-2.6.conf
@@ -1,7 +1,7 @@
 # Zaurus Clamshell specific configuration for kernel 2.6
 # Don't forget to include zaurus-clamshell.conf as well
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 PREFERRED_VERSION_wpa_supplicant = "0.4.7"
 
 PCMCIA_MANAGER ?= "pcmciautils"
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index afc1318f40..edd68c08f8 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -8,7 +8,7 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700"
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 
 #use this for a hx2xxx ipaq
-#PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+#PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
diff --git a/conf/machine/qemuarm.conf b/conf/machine/qemuarm.conf
index d67acac50f..371ba927bb 100644
--- a/conf/machine/qemuarm.conf
+++ b/conf/machine/qemuarm.conf
@@ -10,6 +10,6 @@ require conf/machine/include/tune-arm926ejs.conf
 
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
 MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file
diff --git a/packages/linux/linux-openzaurus-2.6.16/.mtn2git_empty b/packages/linux/linux-rp-2.6.16/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.16/.mtn2git_empty
+++ b/packages/linux/linux-rp-2.6.16/.mtn2git_empty
diff --git a/packages/linux/linux-openzaurus-2.6.16/00-hostap.patch b/packages/linux/linux-rp-2.6.16/00-hostap.patch
index 20432b404a..20432b404a 100644
--- a/packages/linux/linux-openzaurus-2.6.16/00-hostap.patch
+++ b/packages/linux/linux-rp-2.6.16/00-hostap.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/10-pcnet.patch b/packages/linux/linux-rp-2.6.16/10-pcnet.patch
index 2e1966e837..2e1966e837 100644
--- a/packages/linux/linux-openzaurus-2.6.16/10-pcnet.patch
+++ b/packages/linux/linux-rp-2.6.16/10-pcnet.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/add-oz-release-string.patch b/packages/linux/linux-rp-2.6.16/add-oz-release-string.patch
index 22a6fd3943..22a6fd3943 100644
--- a/packages/linux/linux-openzaurus-2.6.16/add-oz-release-string.patch
+++ b/packages/linux/linux-rp-2.6.16/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/connectplus-remove-ide-HACK.patch b/packages/linux/linux-rp-2.6.16/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/packages/linux/linux-openzaurus-2.6.16/connectplus-remove-ide-HACK.patch
+++ b/packages/linux/linux-rp-2.6.16/connectplus-remove-ide-HACK.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-akita b/packages/linux/linux-rp-2.6.16/defconfig-akita
index 249466ac87..249466ac87 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-akita
+++ b/packages/linux/linux-rp-2.6.16/defconfig-akita
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 b/packages/linux/linux-rp-2.6.16/defconfig-c7x0
index 1d702f60c0..1d702f60c0 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0
+++ b/packages/linux/linux-rp-2.6.16/defconfig-c7x0
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-collie b/packages/linux/linux-rp-2.6.16/defconfig-collie
index 67bda811c4..67bda811c4 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.16/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-hx2000 b/packages/linux/linux-rp-2.6.16/defconfig-hx2000
index c1344660f3..c1344660f3 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-hx2000
+++ b/packages/linux/linux-rp-2.6.16/defconfig-hx2000
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle b/packages/linux/linux-rp-2.6.16/defconfig-poodle
index 8450fc9b68..8450fc9b68 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-poodle
+++ b/packages/linux/linux-rp-2.6.16/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm b/packages/linux/linux-rp-2.6.16/defconfig-qemuarm
index 33f9693d9b..33f9693d9b 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm
+++ b/packages/linux/linux-rp-2.6.16/defconfig-qemuarm
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz b/packages/linux/linux-rp-2.6.16/defconfig-spitz
index d2b4c470aa..d2b4c470aa 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.16/defconfig-spitz
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa b/packages/linux/linux-rp-2.6.16/defconfig-tosa
index 543aa10bb3..543aa10bb3 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa
+++ b/packages/linux/linux-rp-2.6.16/defconfig-tosa
diff --git a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch
index b5a570d38c..b5a570d38c 100644
--- a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r5.patch
+++ b/packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/locomo-kbd-hotkeys.patch b/packages/linux/linux-rp-2.6.16/locomo-kbd-hotkeys.patch
index 8b296780d4..8b296780d4 100644
--- a/packages/linux/linux-openzaurus-2.6.16/locomo-kbd-hotkeys.patch
+++ b/packages/linux/linux-rp-2.6.16/locomo-kbd-hotkeys.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/locomo-lcd-def-bightness.patch b/packages/linux/linux-rp-2.6.16/locomo-lcd-def-bightness.patch
index 6408ef9551..6408ef9551 100644
--- a/packages/linux/linux-openzaurus-2.6.16/locomo-lcd-def-bightness.patch
+++ b/packages/linux/linux-rp-2.6.16/locomo-lcd-def-bightness.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch b/packages/linux/linux-rp-2.6.16/locomo-sysrq+keyrepeat.patch
index 7e233277da..7e233277da 100644
--- a/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch
+++ b/packages/linux/linux-rp-2.6.16/locomo-sysrq+keyrepeat.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/maxpower-message.patch b/packages/linux/linux-rp-2.6.16/maxpower-message.patch
index 6e76be4d1c..6e76be4d1c 100644
--- a/packages/linux/linux-openzaurus-2.6.16/maxpower-message.patch
+++ b/packages/linux/linux-rp-2.6.16/maxpower-message.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/pxa-serial-hack.patch b/packages/linux/linux-rp-2.6.16/pxa-serial-hack.patch
index b3a7f786ea..b3a7f786ea 100644
--- a/packages/linux/linux-openzaurus-2.6.16/pxa-serial-hack.patch
+++ b/packages/linux/linux-rp-2.6.16/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/rmk-mmc1.patch b/packages/linux/linux-rp-2.6.16/rmk-mmc1.patch
index 054b48d28d..054b48d28d 100644
--- a/packages/linux/linux-openzaurus-2.6.16/rmk-mmc1.patch
+++ b/packages/linux/linux-rp-2.6.16/rmk-mmc1.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/rmk-mmc2.patch b/packages/linux/linux-rp-2.6.16/rmk-mmc2.patch
index cef02436d6..cef02436d6 100644
--- a/packages/linux/linux-openzaurus-2.6.16/rmk-mmc2.patch
+++ b/packages/linux/linux-rp-2.6.16/rmk-mmc2.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/packages/linux/linux-rp-2.6.16/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index 18bf4268fc..18bf4268fc 100644
--- a/packages/linux/linux-openzaurus-2.6.16/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/packages/linux/linux-rp-2.6.16/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/packages/linux/linux-openzaurus-2.6.16/squashfs3.0-2.6.15.patch b/packages/linux/linux-rp-2.6.16/squashfs3.0-2.6.15.patch
index 6fec9eba03..6fec9eba03 100644
--- a/packages/linux/linux-openzaurus-2.6.16/squashfs3.0-2.6.15.patch
+++ b/packages/linux/linux-rp-2.6.16/squashfs3.0-2.6.15.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/.mtn2git_empty b/packages/linux/linux-rp-2.6.17/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.17/.mtn2git_empty
+++ b/packages/linux/linux-rp-2.6.17/.mtn2git_empty
diff --git a/packages/linux/linux-openzaurus-2.6.17/00-hostap.patch b/packages/linux/linux-rp-2.6.17/00-hostap.patch
index 20432b404a..20432b404a 100644
--- a/packages/linux/linux-openzaurus-2.6.17/00-hostap.patch
+++ b/packages/linux/linux-rp-2.6.17/00-hostap.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/10-pcnet.patch b/packages/linux/linux-rp-2.6.17/10-pcnet.patch
index 2e1966e837..2e1966e837 100644
--- a/packages/linux/linux-openzaurus-2.6.17/10-pcnet.patch
+++ b/packages/linux/linux-rp-2.6.17/10-pcnet.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/add-oz-release-string.patch b/packages/linux/linux-rp-2.6.17/add-oz-release-string.patch
index 22a6fd3943..22a6fd3943 100644
--- a/packages/linux/linux-openzaurus-2.6.17/add-oz-release-string.patch
+++ b/packages/linux/linux-rp-2.6.17/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/asoc-v0.12.4_2.6.17.patch b/packages/linux/linux-rp-2.6.17/asoc-v0.12.4_2.6.17.patch
index 7fa3822bba..7fa3822bba 100644
--- a/packages/linux/linux-openzaurus-2.6.17/asoc-v0.12.4_2.6.17.patch
+++ b/packages/linux/linux-rp-2.6.17/asoc-v0.12.4_2.6.17.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/connectplus-remove-ide-HACK.patch b/packages/linux/linux-rp-2.6.17/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/packages/linux/linux-openzaurus-2.6.17/connectplus-remove-ide-HACK.patch
+++ b/packages/linux/linux-rp-2.6.17/connectplus-remove-ide-HACK.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-akita b/packages/linux/linux-rp-2.6.17/defconfig-akita
index 249466ac87..249466ac87 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-akita
+++ b/packages/linux/linux-rp-2.6.17/defconfig-akita
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-c7x0 b/packages/linux/linux-rp-2.6.17/defconfig-c7x0
index 1d702f60c0..1d702f60c0 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-c7x0
+++ b/packages/linux/linux-rp-2.6.17/defconfig-c7x0
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-collie b/packages/linux/linux-rp-2.6.17/defconfig-collie
index f488d42d93..f488d42d93 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.17/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-hx2000 b/packages/linux/linux-rp-2.6.17/defconfig-hx2000
index ea56989b75..ea56989b75 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-hx2000
+++ b/packages/linux/linux-rp-2.6.17/defconfig-hx2000
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-poodle b/packages/linux/linux-rp-2.6.17/defconfig-poodle
index deacd170f2..deacd170f2 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-poodle
+++ b/packages/linux/linux-rp-2.6.17/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-qemuarm b/packages/linux/linux-rp-2.6.17/defconfig-qemuarm
index abb6726556..abb6726556 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-qemuarm
+++ b/packages/linux/linux-rp-2.6.17/defconfig-qemuarm
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-qemux86 b/packages/linux/linux-rp-2.6.17/defconfig-qemux86
index fb66874b90..fb66874b90 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-qemux86
+++ b/packages/linux/linux-rp-2.6.17/defconfig-qemux86
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-spitz b/packages/linux/linux-rp-2.6.17/defconfig-spitz
index 824fd57aaa..824fd57aaa 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.17/defconfig-spitz
diff --git a/packages/linux/linux-openzaurus-2.6.17/defconfig-tosa b/packages/linux/linux-rp-2.6.17/defconfig-tosa
index 4144e5cf38..4144e5cf38 100644
--- a/packages/linux/linux-openzaurus-2.6.17/defconfig-tosa
+++ b/packages/linux/linux-rp-2.6.17/defconfig-tosa
diff --git a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch
index b5a570d38c..b5a570d38c 100644
--- a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r5.patch
+++ b/packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch b/packages/linux/linux-rp-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch
index 380349f809..380349f809 100644
--- a/packages/linux/linux-openzaurus-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch
+++ b/packages/linux/linux-rp-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/pxa-serial-hack.patch b/packages/linux/linux-rp-2.6.17/pxa-serial-hack.patch
index b3a7f786ea..b3a7f786ea 100644
--- a/packages/linux/linux-openzaurus-2.6.17/pxa-serial-hack.patch
+++ b/packages/linux/linux-rp-2.6.17/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/packages/linux/linux-rp-2.6.17/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index 18bf4268fc..18bf4268fc 100644
--- a/packages/linux/linux-openzaurus-2.6.17/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/packages/linux/linux-rp-2.6.17/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/squashfs3.0-2.6.15.patch b/packages/linux/linux-rp-2.6.17/squashfs3.0-2.6.15.patch
index 6fec9eba03..6fec9eba03 100644
--- a/packages/linux/linux-openzaurus-2.6.17/squashfs3.0-2.6.15.patch
+++ b/packages/linux/linux-rp-2.6.17/squashfs3.0-2.6.15.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/tosa-lcdnoise-r0.patch b/packages/linux/linux-rp-2.6.17/tosa-lcdnoise-r0.patch
index cb014fb8bc..cb014fb8bc 100644
--- a/packages/linux/linux-openzaurus-2.6.17/tosa-lcdnoise-r0.patch
+++ b/packages/linux/linux-rp-2.6.17/tosa-lcdnoise-r0.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/vesafb-tng-1.0-rc2-git-20060629.patch b/packages/linux/linux-rp-2.6.17/vesafb-tng-1.0-rc2-git-20060629.patch
index 188ce6094e..188ce6094e 100644
--- a/packages/linux/linux-openzaurus-2.6.17/vesafb-tng-1.0-rc2-git-20060629.patch
+++ b/packages/linux/linux-rp-2.6.17/vesafb-tng-1.0-rc2-git-20060629.patch
diff --git a/packages/linux/linux-openzaurus-2.6.17/wm97xx-lcdnoise-r0.patch b/packages/linux/linux-rp-2.6.17/wm97xx-lcdnoise-r0.patch
index 191de3af22..191de3af22 100644
--- a/packages/linux/linux-openzaurus-2.6.17/wm97xx-lcdnoise-r0.patch
+++ b/packages/linux/linux-rp-2.6.17/wm97xx-lcdnoise-r0.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/.mtn2git_empty b/packages/linux/linux-rp-2.6.18+git/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/.mtn2git_empty
+++ b/packages/linux/linux-rp-2.6.18+git/.mtn2git_empty
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/add-oz-release-string.patch b/packages/linux/linux-rp-2.6.18+git/add-oz-release-string.patch
index a80a1d5528..a80a1d5528 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/add-oz-release-string.patch
+++ b/packages/linux/linux-rp-2.6.18+git/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/connectplus-remove-ide-HACK.patch b/packages/linux/linux-rp-2.6.18+git/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/connectplus-remove-ide-HACK.patch
+++ b/packages/linux/linux-rp-2.6.18+git/connectplus-remove-ide-HACK.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-akita b/packages/linux/linux-rp-2.6.18+git/defconfig-akita
index 249466ac87..249466ac87 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-akita
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-akita
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-c7x0 b/packages/linux/linux-rp-2.6.18+git/defconfig-c7x0
index 1d702f60c0..1d702f60c0 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-c7x0
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-c7x0
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-collie b/packages/linux/linux-rp-2.6.18+git/defconfig-collie
index f488d42d93..f488d42d93 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-hx2000 b/packages/linux/linux-rp-2.6.18+git/defconfig-hx2000
index ea56989b75..ea56989b75 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-hx2000
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-hx2000
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-poodle b/packages/linux/linux-rp-2.6.18+git/defconfig-poodle
index deacd170f2..deacd170f2 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-poodle
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-qemuarm b/packages/linux/linux-rp-2.6.18+git/defconfig-qemuarm
index abb6726556..abb6726556 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-qemuarm
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-qemuarm
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-qemux86 b/packages/linux/linux-rp-2.6.18+git/defconfig-qemux86
index fb66874b90..fb66874b90 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-qemux86
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-qemux86
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-spitz b/packages/linux/linux-rp-2.6.18+git/defconfig-spitz
index 824fd57aaa..824fd57aaa 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-spitz
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-tosa b/packages/linux/linux-rp-2.6.18+git/defconfig-tosa
index 4144e5cf38..4144e5cf38 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/defconfig-tosa
+++ b/packages/linux/linux-rp-2.6.18+git/defconfig-tosa
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch
index b5a570d38c..b5a570d38c 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/hrw-pcmcia-ids-r5.patch
+++ b/packages/linux/linux-rp-2.6.18+git/hrw-pcmcia-ids-r5.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/pxa-serial-hack.patch b/packages/linux/linux-rp-2.6.18+git/pxa-serial-hack.patch
index 9ece71331a..9ece71331a 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/pxa-serial-hack.patch
+++ b/packages/linux/linux-rp-2.6.18+git/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/packages/linux/linux-rp-2.6.18+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index 18bf4268fc..18bf4268fc 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/packages/linux/linux-rp-2.6.18+git/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/sharpsl-pm-postresume-r1.patch b/packages/linux/linux-rp-2.6.18+git/sharpsl-pm-postresume-r1.patch
index 409daf03e6..409daf03e6 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/sharpsl-pm-postresume-r1.patch
+++ b/packages/linux/linux-rp-2.6.18+git/sharpsl-pm-postresume-r1.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/squashfs3.0-2.6.15.patch b/packages/linux/linux-rp-2.6.18+git/squashfs3.0-2.6.15.patch
index 097659abad..097659abad 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/squashfs3.0-2.6.15.patch
+++ b/packages/linux/linux-rp-2.6.18+git/squashfs3.0-2.6.15.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/tmio-nand-r7.patch b/packages/linux/linux-rp-2.6.18+git/tmio-nand-r7.patch
index b6ce56eea4..b6ce56eea4 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/tmio-nand-r7.patch
+++ b/packages/linux/linux-rp-2.6.18+git/tmio-nand-r7.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/tmio-ohci-r6.patch b/packages/linux/linux-rp-2.6.18+git/tmio-ohci-r6.patch
index 9fdd2962c9..9fdd2962c9 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/tmio-ohci-r6.patch
+++ b/packages/linux/linux-rp-2.6.18+git/tmio-ohci-r6.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/tmio-tc6393-r8.patch b/packages/linux/linux-rp-2.6.18+git/tmio-tc6393-r8.patch
index 2f1b47d783..2f1b47d783 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/tmio-tc6393-r8.patch
+++ b/packages/linux/linux-rp-2.6.18+git/tmio-tc6393-r8.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/tosa-keyboard-r18.patch b/packages/linux/linux-rp-2.6.18+git/tosa-keyboard-r18.patch
index 00bac40db5..00bac40db5 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/tosa-keyboard-r18.patch
+++ b/packages/linux/linux-rp-2.6.18+git/tosa-keyboard-r18.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/tosa-lcdnoise-r1.patch b/packages/linux/linux-rp-2.6.18+git/tosa-lcdnoise-r1.patch
index 624098bc64..624098bc64 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/tosa-lcdnoise-r1.patch
+++ b/packages/linux/linux-rp-2.6.18+git/tosa-lcdnoise-r1.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/tosa-tmio-lcd-r10.patch b/packages/linux/linux-rp-2.6.18+git/tosa-tmio-lcd-r10.patch
index aef3a047c1..aef3a047c1 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/tosa-tmio-lcd-r10.patch
+++ b/packages/linux/linux-rp-2.6.18+git/tosa-tmio-lcd-r10.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/wm9712-reset-loop-r2.patch b/packages/linux/linux-rp-2.6.18+git/wm9712-reset-loop-r2.patch
index 78e81ea83a..78e81ea83a 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/wm9712-reset-loop-r2.patch
+++ b/packages/linux/linux-rp-2.6.18+git/wm9712-reset-loop-r2.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/wm9712-suspend-cold-res-r2.patch b/packages/linux/linux-rp-2.6.18+git/wm9712-suspend-cold-res-r2.patch
index 5179b47cc4..5179b47cc4 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/wm9712-suspend-cold-res-r2.patch
+++ b/packages/linux/linux-rp-2.6.18+git/wm9712-suspend-cold-res-r2.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18+git/wm97xx-lcdnoise-r0.patch b/packages/linux/linux-rp-2.6.18+git/wm97xx-lcdnoise-r0.patch
index 191de3af22..191de3af22 100644
--- a/packages/linux/linux-openzaurus-2.6.18+git/wm97xx-lcdnoise-r0.patch
+++ b/packages/linux/linux-rp-2.6.18+git/wm97xx-lcdnoise-r0.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/.mtn2git_empty b/packages/linux/linux-rp-2.6.18/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.18/.mtn2git_empty
+++ b/packages/linux/linux-rp-2.6.18/.mtn2git_empty
diff --git a/packages/linux/linux-openzaurus-2.6.18/add-oz-release-string.patch b/packages/linux/linux-rp-2.6.18/add-oz-release-string.patch
index 44b33c2e56..44b33c2e56 100644
--- a/packages/linux/linux-openzaurus-2.6.18/add-oz-release-string.patch
+++ b/packages/linux/linux-rp-2.6.18/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/collie-mcp-r1.patch b/packages/linux/linux-rp-2.6.18/collie-mcp-r1.patch
index a7b2342fd0..a7b2342fd0 100644
--- a/packages/linux/linux-openzaurus-2.6.18/collie-mcp-r1.patch
+++ b/packages/linux/linux-rp-2.6.18/collie-mcp-r1.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/connectplus-remove-ide-HACK.patch b/packages/linux/linux-rp-2.6.18/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/packages/linux/linux-openzaurus-2.6.18/connectplus-remove-ide-HACK.patch
+++ b/packages/linux/linux-rp-2.6.18/connectplus-remove-ide-HACK.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-akita b/packages/linux/linux-rp-2.6.18/defconfig-akita
index c56e81b602..c56e81b602 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-akita
+++ b/packages/linux/linux-rp-2.6.18/defconfig-akita
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-c7x0 b/packages/linux/linux-rp-2.6.18/defconfig-c7x0
index 0cf0d20513..0cf0d20513 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-c7x0
+++ b/packages/linux/linux-rp-2.6.18/defconfig-c7x0
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-collie b/packages/linux/linux-rp-2.6.18/defconfig-collie
index d31322c4da..d31322c4da 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.18/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-hx2000 b/packages/linux/linux-rp-2.6.18/defconfig-hx2000
index 91ba05fb6b..91ba05fb6b 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-hx2000
+++ b/packages/linux/linux-rp-2.6.18/defconfig-hx2000
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-poodle b/packages/linux/linux-rp-2.6.18/defconfig-poodle
index deacd170f2..deacd170f2 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-poodle
+++ b/packages/linux/linux-rp-2.6.18/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-qemuarm b/packages/linux/linux-rp-2.6.18/defconfig-qemuarm
index badf692a96..badf692a96 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-qemuarm
+++ b/packages/linux/linux-rp-2.6.18/defconfig-qemuarm
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-qemux86 b/packages/linux/linux-rp-2.6.18/defconfig-qemux86
index 92ad5eca2d..92ad5eca2d 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-qemux86
+++ b/packages/linux/linux-rp-2.6.18/defconfig-qemux86
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-spitz b/packages/linux/linux-rp-2.6.18/defconfig-spitz
index f425956323..f425956323 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-spitz
+++ b/packages/linux/linux-rp-2.6.18/defconfig-spitz
diff --git a/packages/linux/linux-openzaurus-2.6.18/defconfig-tosa b/packages/linux/linux-rp-2.6.18/defconfig-tosa
index e3ca24eae9..e3ca24eae9 100644
--- a/packages/linux/linux-openzaurus-2.6.18/defconfig-tosa
+++ b/packages/linux/linux-rp-2.6.18/defconfig-tosa
diff --git a/packages/linux/linux-openzaurus-2.6.18/hrw-pcmcia-ids-r5.patch b/packages/linux/linux-rp-2.6.18/hrw-pcmcia-ids-r5.patch
index b5a570d38c..b5a570d38c 100644
--- a/packages/linux/linux-openzaurus-2.6.18/hrw-pcmcia-ids-r5.patch
+++ b/packages/linux/linux-rp-2.6.18/hrw-pcmcia-ids-r5.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/orinoco-remove-all-which-are-in-hostap-HACK.patch b/packages/linux/linux-rp-2.6.18/orinoco-remove-all-which-are-in-hostap-HACK.patch
index 380349f809..380349f809 100644
--- a/packages/linux/linux-openzaurus-2.6.18/orinoco-remove-all-which-are-in-hostap-HACK.patch
+++ b/packages/linux/linux-rp-2.6.18/orinoco-remove-all-which-are-in-hostap-HACK.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/pxa-serial-hack.patch b/packages/linux/linux-rp-2.6.18/pxa-serial-hack.patch
index 5d1b76d5e1..5d1b76d5e1 100644
--- a/packages/linux/linux-openzaurus-2.6.18/pxa-serial-hack.patch
+++ b/packages/linux/linux-rp-2.6.18/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch b/packages/linux/linux-rp-2.6.18/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
index 18bf4268fc..18bf4268fc 100644
--- a/packages/linux/linux-openzaurus-2.6.18/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
+++ b/packages/linux/linux-rp-2.6.18/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/squashfs3.0-2.6.15.patch b/packages/linux/linux-rp-2.6.18/squashfs3.0-2.6.15.patch
index 2a1665a383..2a1665a383 100644
--- a/packages/linux/linux-openzaurus-2.6.18/squashfs3.0-2.6.15.patch
+++ b/packages/linux/linux-rp-2.6.18/squashfs3.0-2.6.15.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/tmio-nand-r6.patch b/packages/linux/linux-rp-2.6.18/tmio-nand-r6.patch
index 0fa803b874..0fa803b874 100644
--- a/packages/linux/linux-openzaurus-2.6.18/tmio-nand-r6.patch
+++ b/packages/linux/linux-rp-2.6.18/tmio-nand-r6.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/tmio-ohci-r5.patch b/packages/linux/linux-rp-2.6.18/tmio-ohci-r5.patch
index a87469afb3..a87469afb3 100644
--- a/packages/linux/linux-openzaurus-2.6.18/tmio-ohci-r5.patch
+++ b/packages/linux/linux-rp-2.6.18/tmio-ohci-r5.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/tmio-tc6393-r7.patch b/packages/linux/linux-rp-2.6.18/tmio-tc6393-r7.patch
index 844e3757a1..844e3757a1 100644
--- a/packages/linux/linux-openzaurus-2.6.18/tmio-tc6393-r7.patch
+++ b/packages/linux/linux-rp-2.6.18/tmio-tc6393-r7.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/tosa-lcdnoise-r1.patch b/packages/linux/linux-rp-2.6.18/tosa-lcdnoise-r1.patch
index 624098bc64..624098bc64 100644
--- a/packages/linux/linux-openzaurus-2.6.18/tosa-lcdnoise-r1.patch
+++ b/packages/linux/linux-rp-2.6.18/tosa-lcdnoise-r1.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/tosa-tmio-lcd-r9.patch b/packages/linux/linux-rp-2.6.18/tosa-tmio-lcd-r9.patch
index 5887822074..5887822074 100644
--- a/packages/linux/linux-openzaurus-2.6.18/tosa-tmio-lcd-r9.patch
+++ b/packages/linux/linux-rp-2.6.18/tosa-tmio-lcd-r9.patch
diff --git a/packages/linux/linux-openzaurus-2.6.18/wm97xx-lcdnoise-r0.patch b/packages/linux/linux-rp-2.6.18/wm97xx-lcdnoise-r0.patch
index 191de3af22..191de3af22 100644
--- a/packages/linux/linux-openzaurus-2.6.18/wm97xx-lcdnoise-r0.patch
+++ b/packages/linux/linux-rp-2.6.18/wm97xx-lcdnoise-r0.patch
diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-rp.inc
index 95c5af6d1a..95c5af6d1a 100644
--- a/packages/linux/linux-openzaurus.inc
+++ b/packages/linux/linux-rp.inc
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-rp_2.6.16.bb
index 984e5b102b..3f41dfb07c 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-rp_2.6.16.bb
@@ -1,4 +1,4 @@
-require linux-openzaurus.inc
+require linux-rp.inc
 
 PR = "r47"
 
diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-rp_2.6.17.bb
index 2acc7a3070..cec88f3a71 100644
--- a/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/packages/linux/linux-rp_2.6.17.bb
@@ -1,4 +1,4 @@
-require linux-openzaurus.inc
+require linux-rp.inc
 
 PR = "r31"
 
diff --git a/packages/linux/linux-openzaurus_2.6.18+git.bb b/packages/linux/linux-rp_2.6.18+git.bb
index 6232c9bf47..c8e9a58fdd 100644
--- a/packages/linux/linux-openzaurus_2.6.18+git.bb
+++ b/packages/linux/linux-rp_2.6.18+git.bb
@@ -1,4 +1,4 @@
-require linux-openzaurus.inc
+require linux-rp.inc
 
 PR = "r1"
 
diff --git a/packages/linux/linux-openzaurus_2.6.18.bb b/packages/linux/linux-rp_2.6.18.bb
index 19061f1ed4..3307bf60e8 100644
--- a/packages/linux/linux-openzaurus_2.6.18.bb
+++ b/packages/linux/linux-rp_2.6.18.bb
@@ -1,4 +1,4 @@
-require linux-openzaurus.inc
+require linux-rp.inc
 
 PR = "r5"