summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-24 13:00:37 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-24 13:00:37 -0800
commitd3c7e1ab043abd7706db4fbccf327df9e62f7990 (patch)
tree793aec926c57da1e364e04163199262364c627b0 /arch
parentdfe80f63293ece364795c2e87805882c9ec3a266 (diff)
parent4bdac7da5237170b1392f39ebee99d235043fad8 (diff)
downloadlinux-stable-d3c7e1ab043abd7706db4fbccf327df9e62f7990.tar.gz
linux-stable-d3c7e1ab043abd7706db4fbccf327df9e62f7990.tar.bz2
linux-stable-d3c7e1ab043abd7706db4fbccf327df9e62f7990.zip
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
* 'merge' of git://git.secretlab.ca/git/linux-2.6: spi/mpc52xx-spi: fix annotation for remove()-pointer spi/fsl_espi: fix wrong setting of the address in the command buffer spi/fsl_espi: change the read behaviour of the SPIRF of/i2c: Fix request module by alias powerpc/mpc5200: include fs.h in mpc52xx_gpt.c
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/52xx/mpc52xx_gpt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index fea833e18ad5..e0d703c7fdf7 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -63,6 +63,7 @@
#include <linux/of_gpio.h>
#include <linux/kernel.h>
#include <linux/slab.h>
+#include <linux/fs.h>
#include <linux/watchdog.h>
#include <linux/miscdevice.h>
#include <linux/uaccess.h>