summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pnx4008/gpio.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-04-24 15:26:50 +0000
committerSteve French <sfrench@us.ibm.com>2008-04-24 15:26:50 +0000
commit36d99df2fb474222ab47fbe8ae7385661033223b (patch)
tree962e068491b752a944f61c454fad3f8619a1ea3f /arch/arm/mach-pnx4008/gpio.c
parent076d8423a98659a92837b07aa494cb74bfefe77c (diff)
parent3dc5063786b273f1aee545844f6bd4e9651ebffe (diff)
downloadblackbird-op-linux-36d99df2fb474222ab47fbe8ae7385661033223b.tar.gz
blackbird-op-linux-36d99df2fb474222ab47fbe8ae7385661033223b.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-pnx4008/gpio.c')
-rw-r--r--arch/arm/mach-pnx4008/gpio.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pnx4008/gpio.c b/arch/arm/mach-pnx4008/gpio.c
index 1ab84ced7b5a..ef179cab80e2 100644
--- a/arch/arm/mach-pnx4008/gpio.c
+++ b/arch/arm/mach-pnx4008/gpio.c
@@ -17,7 +17,6 @@
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <asm/semaphore.h>
#include <asm/io.h>
#include <asm/arch/platform.h>
#include <asm/arch/gpio.h>
OpenPOWER on IntegriCloud