summaryrefslogtreecommitdiffstats
path: root/drivers/net/caif
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-01-03 10:31:54 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-03 10:31:58 +0000
commitcde9efef401563943d5a58eb9b7274bfdc08ca9b (patch)
tree858a436055612db6282dc63db0fe3ba41147056a /drivers/net/caif
parent50401d77ee4904673042dd737eed436067cc23f5 (diff)
parent60ebe1568fd15b7ffa101acc645069e27d546ed6 (diff)
downloadblackbird-op-linux-cde9efef401563943d5a58eb9b7274bfdc08ca9b.tar.gz
blackbird-op-linux-cde9efef401563943d5a58eb9b7274bfdc08ca9b.zip
Merge branch 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into devel-stable
Diffstat (limited to 'drivers/net/caif')
-rw-r--r--drivers/net/caif/caif_shm_u5500.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/caif/caif_shm_u5500.c b/drivers/net/caif/caif_shm_u5500.c
index 32b1c6fb2de1..5f771ab712c4 100644
--- a/drivers/net/caif/caif_shm_u5500.c
+++ b/drivers/net/caif/caif_shm_u5500.c
@@ -11,7 +11,7 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/netdevice.h>
-#include <mach/mbox.h>
+#include <mach/mbox-db5500.h>
#include <net/caif/caif_shm.h>
MODULE_LICENSE("GPL");
OpenPOWER on IntegriCloud