Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / drivers / usb / musb / cppi_dma.h

diff --git a/drivers/usb/musb/cppi_dma.h b/drivers/usb/musb/cppi_dma.h
index 8a39de3e6e471c9c8f8c7b72f5b515218cb816c4..59bf949e589b85a086be064ffb037a77bedc7e24 100644 (file)
--- a/drivers/usb/musb/cppi_dma.h
+++ b/drivers/usb/musb/cppi_dma.h
@@ -5,7 +5,6 @@
 
 #include <linux/slab.h>
 #include <linux/list.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/dmapool.h>