ar71xx: merge 3.2 fixes

[openwrt/staging/hauke.git] / target / linux / ar71xx / files / drivers / spi / spi-rb4xx-cpld.c

diff --git a/target/linux/ar71xx/files/drivers/spi/spi-rb4xx-cpld.c b/target/linux/ar71xx/files/drivers/spi/spi-rb4xx-cpld.c
index c0040a3e6a638ca01b8182cde671f9b3cae9904c..4e8ce310500ab0f707a8bebef2cf55184ff1a554 100644 (file)
--- a/target/linux/ar71xx/files/drivers/spi/spi-rb4xx-cpld.c
+++ b/target/linux/ar71xx/files/drivers/spi/spi-rb4xx-cpld.c
@@ -13,6 +13,7 @@
 
 #include <linux/types.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/device.h>
@@ -21,7 +22,7 @@
 #include <linux/gpio.h>
 #include <linux/slab.h>
 
-#include <asm/mach-ar71xx/rb4xx_cpld.h>
+#include <asm/mach-ath79/rb4xx_cpld.h>
 
 #define DRV_NAME       "spi-rb4xx-cpld"
 #define DRV_DESC       "RB4xx CPLD driver"