diff options
| author | Dave Martin <dave.martin@linaro.org> | 2011-10-05 09:40:59 -0400 |
|---|---|---|
| committer | Dave Martin <dave.martin@linaro.org> | 2011-11-22 05:58:30 -0500 |
| commit | 1e5f9a23430e64fb56d9d5d8e1ca165ba1cfeb75 (patch) | |
| tree | 5dc5ea5d1895b063a911f1101a906da696b59f53 /include/linux/amba | |
| parent | cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37 (diff) | |
ARM: amba: Move definition of struct amba_id to mod_devicetable.h
The general kernel infrastructure for adding module alises during
module post processing expects the affected device type
identification structures in a common header
<linux/mod_devicetable.h>.
This patch simple moves struct amba_id to the common header, and
adds the appropriate include in <linux/amba/bus.h>.
Signed-off-by: Dave Martin <dave.martin@linaro.org>
Diffstat (limited to 'include/linux/amba')
| -rw-r--r-- | include/linux/amba/bus.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h index fcbbe71a3cc..724c69c40bb 100644 --- a/include/linux/amba/bus.h +++ b/include/linux/amba/bus.h | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | #include <linux/clk.h> | 17 | #include <linux/clk.h> |
| 18 | #include <linux/device.h> | 18 | #include <linux/device.h> |
| 19 | #include <linux/mod_devicetable.h> | ||
| 19 | #include <linux/err.h> | 20 | #include <linux/err.h> |
| 20 | #include <linux/resource.h> | 21 | #include <linux/resource.h> |
| 21 | #include <linux/regulator/consumer.h> | 22 | #include <linux/regulator/consumer.h> |
| @@ -35,12 +36,6 @@ struct amba_device { | |||
| 35 | unsigned int irq[AMBA_NR_IRQS]; | 36 | unsigned int irq[AMBA_NR_IRQS]; |
| 36 | }; | 37 | }; |
| 37 | 38 | ||
| 38 | struct amba_id { | ||
| 39 | unsigned int id; | ||
| 40 | unsigned int mask; | ||
| 41 | void *data; | ||
| 42 | }; | ||
| 43 | |||
| 44 | struct amba_driver { | 39 | struct amba_driver { |
| 45 | struct device_driver drv; | 40 | struct device_driver drv; |
| 46 | int (*probe)(struct amba_device *, const struct amba_id *); | 41 | int (*probe)(struct amba_device *, const struct amba_id *); |
