Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

diff --combined drivers/net/wireless/ipw2200.h
index dc3e7bc805fca208cfd7ac12d923ae6513e200f2,1e49a88091b102c5cc53351f423f8d4b0474082f..66bb5903537f1b06d823e8b6eea9cd564f76285a
--- 1/drivers/net/wireless/ipw2200.h
--- 2/drivers/net/wireless/ipw2200.h
+++ b/drivers/net/wireless/ipw2200.h
@@@ -42,10 -42,10 +42,11 @@@
  #include <linux/etherdevice.h>
  #include <linux/delay.h>
  #include <linux/random.h>
+ #include <linux/dma-mapping.h>
  
  #include <linux/firmware.h>
  #include <linux/wireless.h>
 +#include <linux/dma-mapping.h>
  #include <asm/io.h>
  
  #include <net/ieee80211.h>