diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 05:31:54 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 05:31:58 -0500 |
| commit | cde9efef401563943d5a58eb9b7274bfdc08ca9b (patch) | |
| tree | 858a436055612db6282dc63db0fe3ba41147056a /drivers/net/caif | |
| parent | 50401d77ee4904673042dd737eed436067cc23f5 (diff) | |
| parent | 60ebe1568fd15b7ffa101acc645069e27d546ed6 (diff) | |
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.c | 2 |
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 @@ | |||
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/netdevice.h> | 13 | #include <linux/netdevice.h> |
| 14 | #include <mach/mbox.h> | 14 | #include <mach/mbox-db5500.h> |
| 15 | #include <net/caif/caif_shm.h> | 15 | #include <net/caif/caif_shm.h> |
| 16 | 16 | ||
| 17 | MODULE_LICENSE("GPL"); | 17 | MODULE_LICENSE("GPL"); |