summaryrefslogtreecommitdiff
path: root/include/linux/amba/bus.h
diff options
context:
space:
mode:
authorDave Martin <dave.martin@linaro.org>2011-10-05 14:40:59 +0100
committerDave Martin <dave.martin@linaro.org>2011-11-22 10:58:30 +0000
commit1e5f9a23430e64fb56d9d5d8e1ca165ba1cfeb75 (patch)
tree5dc5ea5d1895b063a911f1101a906da696b59f53 /include/linux/amba/bus.h
parentcfcfc9eca2bcbd26a8e206baeb005b055dbf8e37 (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/bus.h')
-rw-r--r--include/linux/amba/bus.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index fcbbe71a3cc1..724c69c40bb8 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -16,6 +16,7 @@
#include <linux/clk.h>
#include <linux/device.h>
+#include <linux/mod_devicetable.h>
#include <linux/err.h>
#include <linux/resource.h>
#include <linux/regulator/consumer.h>
@@ -35,12 +36,6 @@ struct amba_device {
unsigned int irq[AMBA_NR_IRQS];
};
-struct amba_id {
- unsigned int id;
- unsigned int mask;
- void *data;
-};
-
struct amba_driver {
struct device_driver drv;
int (*probe)(struct amba_device *, const struct amba_id *);