diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-22 14:56:50 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-22 14:57:00 -0700 |
| commit | 9bde36afcaf0ec2ad9f03974da41875c759a4fe8 (patch) | |
| tree | 5b6f2fd6c86d5dadaf427c302ed35f738c2be55b /include | |
| parent | f020c39e51b1ef8389d5cf38190d32f55ff9d556 (diff) | |
| parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
| download | kernel_samsung_smdk4412-9bde36afcaf0ec2ad9f03974da41875c759a4fe8.zip kernel_samsung_smdk4412-9bde36afcaf0ec2ad9f03974da41875c759a4fe8.tar.gz kernel_samsung_smdk4412-9bde36afcaf0ec2ad9f03974da41875c759a4fe8.tar.bz2 | |
Merge branch 'devicetree/next' into spi/next
To pick up removal of #ifdef around .of_match_table
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device.h | 7 | ||||
| -rw-r--r-- | include/linux/i2c.h | 2 | ||||
| -rw-r--r-- | include/linux/of.h | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 1bf5cf0..ca5d252 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -128,9 +128,7 @@ struct device_driver { bool suppress_bind_attrs; /* disables bind/unbind via sysfs */ -#if defined(CONFIG_OF) const struct of_device_id *of_match_table; -#endif int (*probe) (struct device *dev); int (*remove) (struct device *dev); @@ -441,9 +439,8 @@ struct device { override */ /* arch specific additions */ struct dev_archdata archdata; -#ifdef CONFIG_OF - struct device_node *of_node; -#endif + + struct device_node *of_node; /* associated device tree node */ dev_t devt; /* dev_t, creates the sysfs "dev" */ diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 903576d..06a8d9c 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -258,9 +258,7 @@ struct i2c_board_info { unsigned short addr; void *platform_data; struct dev_archdata *archdata; -#ifdef CONFIG_OF struct device_node *of_node; -#endif int irq; }; diff --git a/include/linux/of.h b/include/linux/of.h index cad7cf0..d9dd664 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -23,8 +23,6 @@ #include <asm/byteorder.h> -#ifdef CONFIG_OF - typedef u32 phandle; typedef u32 ihandle; @@ -65,6 +63,8 @@ struct device_node { #endif }; +#ifdef CONFIG_OF + /* Pointer for first entry in chain of all nodes. */ extern struct device_node *allnodes; extern struct device_node *of_chosen; |