--- 10-usb-pda.fdi.orig	2006-04-04 11:41:03 +0400
+++ 10-usb-pda.fdi.orig	2006-04-04 11:42:44 +0400
@@ -30,17 +30,17 @@ 
 	<match key="@serial.physical_device:usb.vendor_id" int="0x054c">
   	  <!-- Sony Clie 3.5 -->
           <match key="@serial.physical_device:usb.product_id" int="0x0038">
+            <merge key="pda.platform" type="string">palm</merge>
             <match key="serial.port" int="0">
               <append key="info.capabilities" type="strlist">pda</append>
-              <merge key="pda.platform" type="string">palm</merge>
               <merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
             </match>
           </match>
   	  <!-- Sony Clie SJ-22 -->
           <match key="@serial.physical_device:usb.product_id" int="0x0066">
+            <merge key="pda.platform" type="string">palm</merge>
             <match key="serial.port" int="0">
               <append key="info.capabilities" type="strlist">pda</append>
-              <merge key="pda.platform" type="string">palm</merge>
               <merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
             </match>
           </match>
@@ -56,9 +56,9 @@ 
 	<match key="@serial.physical_device:usb.vendor_id" int="0x082d">
   	  <!-- Visor -->
           <match key="@serial.physical_device:usb.product_id" int="0x0100">
+            <merge key="pda.platform" type="string">palm</merge>
             <match key="serial.port" int="1">
               <append key="info.capabilities" type="strlist">pda</append>
-              <merge key="pda.platform" type="string">palm</merge>
               <merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
             </match>
           </match>
@@ -74,25 +74,25 @@ 
 	<match key="@serial.physical_device:usb.vendor_id" int="0x0830">
   	  <!-- Palm m130 -->
           <match key="@serial.physical_device:usb.product_id" int="0x0050">
+            <merge key="pda.platform" type="string">palm</merge>
             <match key="serial.port" int="0">
               <append key="info.capabilities" type="strlist">pda</append>
-              <merge key="pda.platform" type="string">palm</merge>
               <merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
             </match>
           </match>
 	  <!-- Tungsten T3 -->
 	  <match key="@serial.physical_device:usb.product_id" int="0x0060">
+    	    <merge key="pda.platform" type="string">palm</merge>
 	    <match key="serial.port" int="1">
     	      <append key="info.capabilities" type="strlist">pda</append>
-    	      <merge key="pda.platform" type="string">palm</merge>
     	      <merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
 	    </match>
 	  </match>
   	  <!-- Tungsten T5 -->
           <match key="@serial.physical_device:usb.product_id" int="0x0061">
+            <merge key="pda.platform" type="string">palm</merge>
             <match key="serial.port" int="1">
               <append key="info.capabilities" type="strlist">pda</append>
-              <merge key="pda.platform" type="string">palm</merge>
               <merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
             </match>
           </match>