projects
/
linux-2.6-block.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/pablo/nf
[linux-2.6-block.git]
/
drivers
/
staging
/
nvec
/
nvec.h
diff --git
a/drivers/staging/nvec/nvec.h
b/drivers/staging/nvec/nvec.h
index c03ca8d9572a316ae0b56bb553e5435638bcde06..aa7c70ef94f5f7d51017c0b63491f5c8ac88f794 100644
(file)
--- a/
drivers/staging/nvec/nvec.h
+++ b/
drivers/staging/nvec/nvec.h
@@
-138,7
+138,7
@@
struct nvec_chip {
struct device *dev;
int gpio;
int irq;
-
int
i2c_addr;
+
u32
i2c_addr;
void __iomem *base;
struct clk *i2c_clk;
struct reset_control *rst;