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 git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
[pandora-kernel.git]
/
arch
/
arm
/
mach-ux500
/
devices-common.h
diff --git
a/arch/arm/mach-ux500/devices-common.h
b/arch/arm/mach-ux500/devices-common.h
index
cbadc11
..
c719b5a
100644
(file)
--- a/
arch/arm/mach-ux500/devices-common.h
+++ b/
arch/arm/mach-ux500/devices-common.h
@@
-42,10
+42,13
@@
dbx500_add_sdi(const char *name, resource_size_t base, int irq,
return dbx500_add_amba_device(name, base, irq, pdata, 0);
}
return dbx500_add_amba_device(name, base, irq, pdata, 0);
}
+struct amba_pl011_data;
+
static inline struct amba_device *
static inline struct amba_device *
-dbx500_add_uart(const char *name, resource_size_t base, int irq)
+dbx500_add_uart(const char *name, resource_size_t base, int irq,
+ struct amba_pl011_data *pdata)
{
{
- return dbx500_add_amba_device(name, base, irq,
NULL
, 0);
+ return dbx500_add_amba_device(name, base, irq,
pdata
, 0);
}
struct nmk_i2c_controller;
}
struct nmk_i2c_controller;