git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[pandora-kernel.git]
/
arch
/
arm
/
mach-mxs
/
include
/
mach
/
devices-common.h
diff --git
a/arch/arm/mach-mxs/include/mach/devices-common.h
b/arch/arm/mach-mxs/include/mach/devices-common.h
index
c5137f1
..
7a37469
100644
(file)
--- a/
arch/arm/mach-mxs/include/mach/devices-common.h
+++ b/
arch/arm/mach-mxs/include/mach/devices-common.h
@@
-65,13
+65,14
@@
struct platform_device *__init mxs_add_flexcan(
const struct flexcan_platform_data *pdata);
/* i2c */
const struct flexcan_platform_data *pdata);
/* i2c */
-struct mxs_i2c_data {
+struct mxs_
mxs_
i2c_data {
int id;
resource_size_t iobase;
resource_size_t errirq;
resource_size_t dmairq;
};
int id;
resource_size_t iobase;
resource_size_t errirq;
resource_size_t dmairq;
};
-struct platform_device * __init mxs_add_mxs_i2c(const struct mxs_i2c_data *data);
+struct platform_device * __init mxs_add_mxs_i2c(
+ const struct mxs_mxs_i2c_data *data);
/* mmc */
#include <mach/mmc.h>
/* mmc */
#include <mach/mmc.h>