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/mod_devicetable.h | |
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/mod_devicetable.h')
-rw-r--r-- | include/linux/mod_devicetable.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 468819cdde87..83ac0713ed0a 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
@@ -542,4 +542,22 @@ struct isapnp_device_id { | |||
542 | kernel_ulong_t driver_data; /* data private to the driver */ | 542 | kernel_ulong_t driver_data; /* data private to the driver */ |
543 | }; | 543 | }; |
544 | 544 | ||
545 | /** | ||
546 | * struct amba_id - identifies a device on an AMBA bus | ||
547 | * @id: The significant bits if the hardware device ID | ||
548 | * @mask: Bitmask specifying which bits of the id field are significant when | ||
549 | * matching. A driver binds to a device when ((hardware device ID) & mask) | ||
550 | * == id. | ||
551 | * @data: Private data used by the driver. | ||
552 | */ | ||
553 | struct amba_id { | ||
554 | unsigned int id; | ||
555 | unsigned int mask; | ||
556 | #ifndef __KERNEL__ | ||
557 | kernel_ulong_t data; | ||
558 | #else | ||
559 | void *data; | ||
560 | #endif | ||
561 | }; | ||
562 | |||
545 | #endif /* LINUX_MOD_DEVICETABLE_H */ | 563 | #endif /* LINUX_MOD_DEVICETABLE_H */ |