base-files: disable /dev/mmcda1 for all Zaurus machines - we use 2.6 not 2.4

diff --git a/packages/base-files/base-files/akita/fstab b/packages/base-files/base-files/akita/fstab
index 8a2b07a089a79046dc0229a50cd2e4d8369b60e9..46b778600e9b858ed59aebd55d3f4665f8e70b2e 100644 (file)
--- a/packages/base-files/base-files/akita/fstab
+++ b/packages/base-files/base-files/akita/fstab
@@ -8,12 +8,12 @@ tmpfs         /media/ram      tmpfs   defaults        0  0
 tmpfs                /dev/shm             tmpfs      mode=0777             0  0
 
 # SD/MMC in kernel 2.4
-/dev/mmcda1    /media/card     auto    defaults,sync,noauto    0  0
+#/dev/mmcda1   /media/card     auto    defaults,sync,noauto    0  0
 # SD/MMC in kernel 2.6
 /dev/mmcblk0p1 /media/card     auto    defaults,sync,noauto    0  0
 
 # USB Storage
 /dev/sda1 /media/usbhdd                vfat    noauto,umask=000,noatime,iocharset=utf8,codepage=932    0       0
-usbfs     /proc/bus/usb        usbf    defaults                0  0
+usbfs     /proc/bus/usb        usbfs    defaults                0  0
 
 

diff --git a/packages/base-files/base-files/c7x0/fstab b/packages/base-files/base-files/c7x0/fstab
index c3de8d28dc8643ecc6500ad193e89f9f0170080e..54fe5569056cc62f0dfccc34b076c276f4f506b2 100644 (file)
--- a/packages/base-files/base-files/c7x0/fstab
+++ b/packages/base-files/base-files/c7x0/fstab
@@ -8,6 +8,6 @@ tmpfs           /media/ram      tmpfs   defaults        0  0
 tmpfs                /dev/shm             tmpfs      mode=0777             0  0
 
 # SD/MMC in kernel 2.4
-/dev/mmcda1    /media/card     auto    defaults,sync,noauto    0  0
+#/dev/mmcda1   /media/card     auto    defaults,sync,noauto    0  0
 # SD/MMC in kernel 2.6
 /dev/mmcblk0p1 /media/card     auto    defaults,sync,noauto    0  0

diff --git a/packages/base-files/base-files/collie/fstab b/packages/base-files/base-files/collie/fstab
index a3a9ea2df15427e76dd9e4eacc56dff529e91b7a..c2e3f3c189151d8bb15a45f84d9b6049ddbec9ea 100644 (file)
--- a/packages/base-files/base-files/collie/fstab
+++ b/packages/base-files/base-files/collie/fstab
@@ -1,9 +1,13 @@
 /dev/mtdblock4 /       jffs2   defaults        1  1 
 proc            /proc   proc    defaults        0  0
 /dev/hda1      /media/cf       auto    defaults,sync,noauto,noatime,user,exec,suid,gid=100,umask=0002  0  0
-/dev/mmcda1    /media/card     auto    defaults,sync,noauto,noatime,user,exec,suid     0  0
 tmpfs          /var/volatile   tmpfs   mode=0755       0  0
 tmpfs                /dev/shm             tmpfs      mode=0777             0  0
 
 # we use a non-volatile ramdisk, see /etc/init.d/ramdisk
 #tmpfs         /media/ram      tmpfs   defaults        0  0
+
+# SD/MMC in kernel 2.4
+#/dev/mmcda1   /media/card     auto    defaults,sync,noauto    0  0
+# SD/MMC in kernel 2.6
+/dev/mmcblk0p1 /media/card     auto    defaults,sync,noauto    0  0

diff --git a/packages/base-files/base-files/poodle/fstab b/packages/base-files/base-files/poodle/fstab
index 9f87b91155423dad948d6a1a93fa53e1b9b3d641..64076fa181103614369a2f390b807350839ff6f3 100644 (file)
--- a/packages/base-files/base-files/poodle/fstab
+++ b/packages/base-files/base-files/poodle/fstab
@@ -7,7 +7,7 @@ proc            /proc   proc    defaults        0  0
 /dev/mmcblk0p1 /media/card     auto    defaults,sync,noauto    0  0
 
 # SD/MMC in kernel 2.4
-/dev/mmcda1    /media/card     auto    defaults,sync,noauto    0  0
+#/dev/mmcda1   /media/card     auto    defaults,sync,noauto    0  0
 
 tmpfs                /dev/shm             tmpfs      mode=0777             0  0
 tmpfs          /var/volatile   tmpfs   mode=0755       0  0

diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab
index f2662121353bfd9ca9c10286253e1338705bd480..dc419e62be6e02ba665a6ad1aa5ea175b1c8d195 100644 (file)
--- a/packages/base-files/base-files/spitz/fstab
+++ b/packages/base-files/base-files/spitz/fstab
@@ -12,7 +12,7 @@ tmpfs                /dev/shm             tmpfs      mode=0777             0  0
 # Compact Flash memory cards
 /dev/hdc1       /media/cf       auto    defaults,sync,noauto    0  0
 # SD/MMC in kernel 2.4
-/dev/mmcda1     /media/card     auto    defaults,sync,noauto    0  0
+#/dev/mmcda1     /media/card     auto    defaults,sync,noauto    0  0
 # SD/MMC in kernel 2.6
 /dev/mmcblk0p1  /media/card     auto    defaults,sync,noauto    0  0
 

diff --git a/packages/base-files/base-files/tosa/fstab b/packages/base-files/base-files/tosa/fstab
index 8607c79be8b7ddc2ccbbc7a5cefbcf2d199d8e4e..badbebe1f75b634c71379b196963d824e5d2198a 100644 (file)
--- a/packages/base-files/base-files/tosa/fstab
+++ b/packages/base-files/base-files/tosa/fstab
@@ -10,6 +10,6 @@ tmpfs                /dev/shm             tmpfs      mode=0777             0  0
 usbfs                /proc/bus/usb        usbfs      auto                0 0
 
 # SD/MMC in kernel 2.4
-/dev/mmcda1    /media/card     auto    defaults,sync,noauto    0  0
+#/dev/mmcda1   /media/card     auto    defaults,sync,noauto    0  0
 # SD/MMC in kernel 2.6
 /dev/mmcblk0p1 /media/card     auto    defaults,sync,noauto    0  0

diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 7ccd26b5cf1581a8243428cfaccf2db2bd9f9ad4..98b522c1bd33397eb5089a1a69889ccca6243003 100644 (file)
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r74"
+PR = "r75"
 LICENSE = "GPL"
 
 SRC_URI = " \