[kernel] r16072 - dists/sid/linux-2.6/debian/patches/features/all/xen

[Ben Hutchings]

Author: benh
Date: Tue Aug  3 03:00:02 2010
New Revision: 16072

Log:
Fix conflict with 2.6.32.17

Modified:
   dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch

Modified: dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch	Tue Aug  3 00:45:11 2010	(r16071)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/pvops.patch	Tue Aug  3 03:00:02 2010	(r16072)
@@ -2362,7 +2362,7 @@
  
  void hpet_disable(void)
  {
--	if (is_hpet_capable()) {
+-	if (is_hpet_capable() && hpet_virt_address) {
 -		unsigned long cfg = hpet_readl(HPET_CFG);
 +	unsigned int cfg;