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 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
include
/
mach
/
devices-common.h
diff --git
a/arch/arm/plat-mxc/include/mach/devices-common.h
b/arch/arm/plat-mxc/include/mach/devices-common.h
index
3640eaf
..
8658c9c
100644
(file)
--- a/
arch/arm/plat-mxc/include/mach/devices-common.h
+++ b/
arch/arm/plat-mxc/include/mach/devices-common.h
@@
-67,6
+67,7
@@
struct platform_device *__init imx_add_imx21_hcd(
const struct mx21_usbh_platform_data *pdata);
struct imx_imx2_wdt_data {
+ int id;
resource_size_t iobase;
resource_size_t iosize;
};