Merge branch for-rmk-devel of git://aeryn.fluff.org.uk/bjdooks/linux into devel

2009-06-10 22:40:55 +01:00
parent b0efb42478 99ae99533a
commit 547c32aeb5
118 changed files with 4530 additions and 1359 deletions
--- a/drivers/spi/spi_s3c24xx_gpio.c
+++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -17,6 +17,7 @@
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
 #include <linux/platform_device.h>
+#include <linux/gpio.h>

 #include <linux/spi/spi.h>
 #include <linux/spi/spi_bitbang.h>