Fix trailing whitespace patching.

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

5 files changed, 1499 insertions, 20 deletions

diff --git a/sys-power/phc-intel/ChangeLog b/sys-power/phc-intel/ChangeLog
index 7509e74769db..8f0540eaf269 100644
--- a/sys-power/phc-intel/ChangeLog
+++ b/sys-power/phc-intel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/phc-intel
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/ChangeLog,v 1.12 2013/09/05 13:08:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/ChangeLog,v 1.13 2013/09/05 22:38:45 xmw Exp $
+
+  05 Sep 2013; Michael Weber <xmw@gentoo.org>
+  +files/phc-intel-pack-rev11-trailing-space.patch,
+  -files/phc-intel-0.3.2.12.11-trailing-space.patch,
+  phc-intel-0.3.199.11_pre.ebuild, phc-intel-0.3.2.12.11.ebuild:
+  Fix trailing whitespace patching.
 
 *phc-intel-0.3.199.11_pre (05 Sep 2013)
 *phc-intel-0.3.2.12.11 (05 Sep 2013)
diff --git a/sys-power/phc-intel/files/phc-intel-0.3.2.12.11-trailing-space.patch b/sys-power/phc-intel/files/phc-intel-0.3.2.12.11-trailing-space.patch
deleted file mode 100644
index 576c9211786d..000000000000
--- a/sys-power/phc-intel/files/phc-intel-0.3.2.12.11-trailing-space.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- phc-intel-pack-rev11/acpi-cpufreq.c
-+++ phc-intel-pack-rev11/acpi-cpufreq.c
-@@ -1175,6 +1175,8 @@
- 		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
- 		count += sprintf(&buf[count], "%u:%u ", fid, vid);
- 	}
-+	if (count)
-+		count--; //remove trailing space
- 	count += sprintf(&buf[count], "\n");
- 
- 	return count;
diff --git a/sys-power/phc-intel/files/phc-intel-pack-rev11-trailing-space.patch b/sys-power/phc-intel/files/phc-intel-pack-rev11-trailing-space.patch
new file mode 100644
index 000000000000..303e8f1cd723
--- /dev/null
+++ b/sys-power/phc-intel/files/phc-intel-pack-rev11-trailing-space.patch
@@ -0,0 +1,1482 @@
+Remove trailing white spaces from /proc output.
+
+Signed-off-by: Michael Weber <xmw@gentoo.org>
+--- phc-intel-pack-rev11/inc/2.6.27/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.27/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -757,12 +769,477 @@
++@@ -757,12 +769,482 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -156,6 +156,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -185,6 +186,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -211,6 +213,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -239,6 +242,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -270,6 +274,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.27.57/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.27.57/linux-phc-0.3.2.patch
+@@ -74,7 +74,7 @@
+  
+  	return 0;
+  }
+-@@ -758,12 +770,477 @@
++@@ -758,12 +770,482 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -157,6 +157,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -186,6 +187,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -212,6 +214,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -240,6 +243,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -271,6 +275,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.28/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.28/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -758,12 +770,477 @@
++@@ -758,12 +770,482 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -156,6 +156,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -185,6 +186,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -211,6 +213,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -239,6 +242,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -270,6 +274,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.29/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.29/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -778,12 +790,477 @@
++@@ -778,12 +790,482 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -156,6 +156,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -185,6 +186,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -211,6 +213,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -239,6 +242,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -270,6 +274,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.29.2/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.29.2/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -790,12 +802,477 @@
++@@ -790,12 +802,482 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -156,6 +156,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -185,6 +186,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -211,6 +213,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -239,6 +242,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -270,6 +274,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.30/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.30/linux-phc-0.3.2.patch
+@@ -72,7 +72,7 @@
+  
+  	return 0;
+  }
+-@@ -797,12 +809,474 @@
++@@ -797,12 +809,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.31/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.31/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -793,12 +805,474 @@
++@@ -793,12 +805,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -153,6 +153,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -182,6 +183,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -208,6 +210,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -236,6 +239,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -267,6 +271,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.32/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.32/linux-phc-0.3.2.patch
+@@ -72,7 +72,7 @@
+  
+  	return 0;
+  }
+-@@ -756,12 +768,474 @@
++@@ -756,12 +768,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -153,6 +153,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -182,6 +183,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -208,6 +210,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -236,6 +239,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -267,6 +271,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.32.27/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.32.27/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -757,12 +769,474 @@
++@@ -757,12 +769,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -154,6 +154,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -183,6 +184,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -209,6 +211,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -237,6 +240,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -268,6 +272,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.33/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.33/linux-phc-0.3.2.patch
+@@ -72,7 +72,7 @@
+  
+  	return 0;
+  }
+-@@ -758,12 +770,474 @@
++@@ -758,12 +770,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -153,6 +153,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -182,6 +183,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -208,6 +210,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -236,6 +239,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -267,6 +271,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.33.8/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.33.8/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -759,12 +771,474 @@
++@@ -759,12 +771,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -154,6 +154,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -183,6 +184,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -209,6 +211,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -237,6 +240,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -268,6 +272,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.34/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.34/linux-phc-0.3.2.patch
+@@ -72,7 +72,7 @@
+  
+  	return 0;
+  }
+-@@ -759,12 +771,474 @@
++@@ -759,12 +771,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -153,6 +153,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -182,6 +183,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -208,6 +210,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -236,6 +239,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -267,6 +271,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.34.9/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.34.9/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -760,12 +772,474 @@
++@@ -760,12 +772,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -154,6 +154,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -183,6 +184,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -209,6 +211,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -237,6 +240,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -268,6 +272,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.35/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.35/linux-phc-0.3.2.patch
+@@ -72,7 +72,7 @@
+  
+  	return 0;
+  }
+-@@ -719,12 +731,474 @@
++@@ -719,12 +731,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -153,6 +153,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -182,6 +183,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -208,6 +210,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -236,6 +239,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -267,6 +271,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.35.10/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.35.10/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -720,12 +732,474 @@
++@@ -720,12 +732,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -154,6 +154,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -183,6 +184,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -209,6 +211,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -237,6 +240,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -268,6 +272,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.36/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.36/linux-phc-0.3.2.patch
+@@ -72,7 +72,7 @@
+  
+  	return 0;
+  }
+-@@ -716,12 +728,474 @@
++@@ -716,12 +728,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -153,6 +153,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -182,6 +183,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -208,6 +210,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -236,6 +239,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -267,6 +271,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.36.2/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.36.2/linux-phc-0.3.2.patch
+@@ -73,7 +73,7 @@
+  
+  	return 0;
+  }
+-@@ -717,12 +729,474 @@
++@@ -717,12 +729,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -154,6 +154,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -183,6 +184,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -209,6 +211,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -237,6 +240,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -268,6 +272,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/2.6.37/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/2.6.37/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -717,12 +729,474 @@
++@@ -717,12 +729,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.0/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.0/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.1/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.1/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.10/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.10/linux-phc-0.3.2.patch
+@@ -120,7 +120,7 @@
+  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
+  		msrs = msrs_alloc();
+  
+-@@ -963,10 +965,484 @@
++@@ -963,10 +965,489 @@
+  		msrs_free(msrs);
+  		msrs = NULL;
+  	}
+@@ -198,6 +198,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -227,6 +228,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -253,6 +255,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -281,6 +284,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -312,6 +316,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.11/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.11/linux-phc-0.3.2.patch
+@@ -122,7 +122,7 @@
+  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
+  		msrs = msrs_alloc();
+  
+-@@ -986,10 +987,485 @@
++@@ -986,10 +987,490 @@
+  		msrs_free(msrs);
+  		msrs = NULL;
+  	}
+@@ -200,6 +200,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -229,6 +230,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -255,6 +257,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].driver_data].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -283,6 +286,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].driver_data].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -314,6 +318,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].driver_data]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.2/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.2/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.3/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.3/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.4/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.4/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.5/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.5/linux-phc-0.3.2.patch
+@@ -71,7 +71,7 @@
+  	}
+  
+  	return 0;
+-@@ -714,12 +726,474 @@
++@@ -714,12 +726,479 @@
+  	data->resume = 1;
+  
+  	return 0;
+@@ -152,6 +152,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -181,6 +182,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -207,6 +209,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -235,6 +238,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -266,6 +270,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.7/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.7/linux-phc-0.3.2.patch
+@@ -120,7 +120,7 @@
+  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
+  		msrs = msrs_alloc();
+  
+-@@ -966,10 +968,484 @@
++@@ -966,10 +968,489 @@
+  		msrs_free(msrs);
+  		msrs = NULL;
+  	}
+@@ -198,6 +198,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -227,6 +228,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -253,6 +255,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -281,6 +284,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -312,6 +316,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.7.5/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.7.5/linux-phc-0.3.2.patch
+@@ -120,7 +120,7 @@
+  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
+  		msrs = msrs_alloc();
+  
+-@@ -966,10 +968,484 @@
++@@ -966,10 +968,489 @@
+  		msrs_free(msrs);
+  		msrs = NULL;
+  	}
+@@ -198,6 +198,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -227,6 +228,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -253,6 +255,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -281,6 +284,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -312,6 +316,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+--- phc-intel-pack-rev11/inc/3.9/linux-phc-0.3.2.patch
++++ phc-intel-pack-rev11/inc/3.9/linux-phc-0.3.2.patch
+@@ -120,7 +120,7 @@
+  	if (boot_cpu_has(X86_FEATURE_CPB) || boot_cpu_has(X86_FEATURE_IDA)) {
+  		msrs = msrs_alloc();
+  
+-@@ -970,10 +972,484 @@
++@@ -970,10 +972,489 @@
+  		msrs_free(msrs);
+  		msrs = NULL;
+  	}
+@@ -198,6 +198,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -227,6 +228,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u ", vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -253,6 +255,7 @@
+ +		fid = extract_fid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u ", fid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -281,6 +284,7 @@
+ +		vid = extract_vid_from_control(acpi_data->states[freq_table[i].index].control);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
+@@ -312,6 +316,7 @@
+ +		vid = extract_vid_from_control(data->original_controls[freq_table[i].index]);
+ +		count += sprintf(&buf[count], "%u:%u ", fid, vid);
+ +	}
+++	if (count) count--;
+ +	count += sprintf(&buf[count], "\n");
+ +
+ +	return count;
diff --git a/sys-power/phc-intel/phc-intel-0.3.199.11_pre.ebuild b/sys-power/phc-intel/phc-intel-0.3.199.11_pre.ebuild
index 55864efcb985..3dfd094d689c 100644
--- a/sys-power/phc-intel/phc-intel-0.3.199.11_pre.ebuild
+++ b/sys-power/phc-intel/phc-intel-0.3.199.11_pre.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.199.11_pre.ebuild,v 1.1 2013/09/05 13:08:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.199.11_pre.ebuild,v 1.2 2013/09/05 22:38:45 xmw Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ DESCRIPTION="Processor Hardware Control for Intel CPUs"
 HOMEPAGE="http://www.linux-phc.org/
 	http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"
 #no automatic filenames here, sorry
-SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=147 ->  phc-intel-pack-rev11.tar.bz2"
+SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=147 -> phc-intel-pack-rev11.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -41,6 +41,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/phc-intel-pack-rev11-trailing-space.patch
+
 	sed -e '/^all:/s:prepare::' \
 		-i Makefile || die
 
@@ -48,7 +50,6 @@ src_prepare() {
 	if kernel_is gt 2 6 39 ; then
 		my_sub=drivers
 	fi
-
 	cp -v "${KERNEL_DIR}"/${my_sub}/cpufreq/{acpi-cpufreq.c,mperf.h} . || die
 
 	if kernel_is lt 3 0 ; then
@@ -56,5 +57,6 @@ src_prepare() {
 	else
 		epatch inc/${KV_MAJOR}.${KV_MINOR}/linux-phc-0.4.0.patch
 	fi
+
 	mv acpi-cpufreq.c phc-intel.c || die
 }
diff --git a/sys-power/phc-intel/phc-intel-0.3.2.12.11.ebuild b/sys-power/phc-intel/phc-intel-0.3.2.12.11.ebuild
index 1bf7397d81aa..7197f522195f 100644
--- a/sys-power/phc-intel/phc-intel-0.3.2.12.11.ebuild
+++ b/sys-power/phc-intel/phc-intel-0.3.2.12.11.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.2.12.11.ebuild,v 1.1 2013/09/05 13:08:45 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/phc-intel/phc-intel-0.3.2.12.11.ebuild,v 1.2 2013/09/05 22:38:45 xmw Exp $
 
 EAPI=5
 
-inherit linux-info linux-mod eutils vcs-snapshot
+inherit linux-info linux-mod eutils
 
 DESCRIPTION="Processor Hardware Control for Intel CPUs"
 HOMEPAGE="http://www.linux-phc.org/
 	http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"
 #no automatic filenames here, sorry
-SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=147 ->  phc-intel-pack-rev11.tar.bz2"
+SRC_URI="http://www.linux-phc.org/forum/download/file.php?id=147 -> phc-intel-pack-rev11.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -41,6 +41,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/phc-intel-pack-rev11-trailing-space.patch
+
 	sed -e '/^all:/s:prepare::' \
 		-i Makefile || die
 
@@ -56,7 +58,5 @@ src_prepare() {
 		epatch inc/${KV_MAJOR}.${KV_MINOR}/linux-phc-0.3.2.patch
 	fi
 
-	epatch "${FILESDIR}"/${P}-trailing-space.patch
-
 	mv acpi-cpufreq.c phc-intel.c || die
 }