--- linux-2.6.18.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h.orig	2008-11-18 11:58:35.000000000 -0500
+++ linux-2.6.18.noarch/drivers/net/wireless/iwlwifi/iwl-debug.h	2008-11-18 11:58:37.000000000 -0500
@@ -32,12 +32,12 @@
 #ifdef CONFIG_IWLWIFI_DEBUG
 #define IWL_DEBUG(level, fmt, args...) \
 do { if (priv->debug_level & (level)) \
-  dev_printk(KERN_ERR, &(priv->hw->wiphy->dev), "%c %s " fmt, \
+  dev_printk(KERN_ERR, &(priv->pci_dev->dev), "%c %s " fmt, \
 	 in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)
 
 #define IWL_DEBUG_LIMIT(level, fmt, args...) \
 do { if ((priv->debug_level & (level)) && net_ratelimit()) \
-  dev_printk(KERN_ERR, &(priv->hw->wiphy->dev), "%c %s " fmt, \
+  dev_printk(KERN_ERR, &(priv->pci_dev->dev), "%c %s " fmt, \
 	 in_interrupt() ? 'I' : 'U', __func__ , ## args); } while (0)
 
 #ifdef CONFIG_IWLWIFI_DEBUGFS