diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-01-17 00:05:56 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-01-17 00:06:21 +0400 |
| commit | b93b9d935637fc8ecc90d163587bd37201de3aed (patch) | |
| tree | 36c383c4bb9ae0b95b71f853a5b1d5d49116cf1d /include | |
| parent | ddd06511cec618157b50ffa54c0f0f6ae0f67a01 (diff) | |
| parent | 027d7c326426cc82f6190ac905f23e061b10de04 (diff) | |
Merge device tree support patches from linux-linaro-3.1
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/of_platform.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h index 040ce2f6e8d..2e6631f4c13 100644 --- a/include/linux/of_platform.h +++ b/include/linux/of_platform.h @@ -44,13 +44,18 @@ struct of_dev_auxdata { char *compatible; resource_size_t phys_addr; char *name; + int id; void *platform_data; }; /* Macro to simplify populating a lookup table */ #define OF_DEV_AUXDATA(_compat,_phys,_name,_pdata) \ { .compatible = _compat, .phys_addr = _phys, .name = _name, \ - .platform_data = _pdata } + .id = -1, .platform_data = _pdata } + +#define OF_DEV_AUXDATA_ID(_compat,_phys,_name,_id,_pdata) \ + { .compatible = _compat, .phys_addr = _phys, .name = _name, \ + .id = _id, .platform_data = _pdata } /** * of_platform_driver - Legacy of-aware driver for platform devices. |