diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-01-21 11:24:48 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-01-21 11:24:48 -0500 |
commit | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (patch) | |
tree | 0bba0d79151fc7fab5feb6f9507ec9748b2ba587 /include/linux/i2c.h | |
parent | c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470 (diff) |
driver-core: remove conditionals around devicetree pointers
Having conditional around the of_match_table and the of_node pointers
turns out to make driver code use ugly #ifdef blocks. Drop the
conditionals and remove the #ifdef blocks from the affected drivers.
Also tidy up minor whitespace issues within the same hunks.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/i2c.h')
-rw-r--r-- | include/linux/i2c.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 903576df88dc..06a8d9c7de98 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
@@ -258,9 +258,7 @@ struct i2c_board_info { | |||
258 | unsigned short addr; | 258 | unsigned short addr; |
259 | void *platform_data; | 259 | void *platform_data; |
260 | struct dev_archdata *archdata; | 260 | struct dev_archdata *archdata; |
261 | #ifdef CONFIG_OF | ||
262 | struct device_node *of_node; | 261 | struct device_node *of_node; |
263 | #endif | ||
264 | int irq; | 262 | int irq; |
265 | }; | 263 | }; |
266 | 264 | ||