diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-21 22:46:22 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-21 22:46:22 -0400 |
| commit | 22648cbcf5efd94c2632b3fe8c5c90ae54df928d (patch) | |
| tree | 56a49fcd9a974d61f1a4e224f23efe9b4fd1b438 /arch/arm/include | |
| parent | db9431f0e697b132a7b6aca9c946f85851af5a39 (diff) | |
| parent | 5049b88232de6414144f4cf0f4510227afd0098e (diff) | |
Merge branch 'devicetree/linaro-3.0' of git://git.secretlab.ca/git/linux-2.6 into linaro-3.0
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/mach/arch.h | 7 | ||||
| -rw-r--r-- | arch/arm/include/asm/prom.h | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h index 3281fb4b12e..217aa1911dd 100644 --- a/arch/arm/include/asm/mach/arch.h +++ b/arch/arm/include/asm/mach/arch.h @@ -74,4 +74,11 @@ static const struct machine_desc __mach_desc_##_type \ #define MACHINE_END \ }; +#define DT_MACHINE_START(_name, _namestr) \ +static const struct machine_desc __mach_desc_##_name \ + __used \ + __attribute__((__section__(".arch.info.init"))) = { \ + .nr = ~0, \ + .name = _namestr, + #endif diff --git a/arch/arm/include/asm/prom.h b/arch/arm/include/asm/prom.h index 11b8708fc4d..6f65ca86a5e 100644 --- a/arch/arm/include/asm/prom.h +++ b/arch/arm/include/asm/prom.h @@ -16,11 +16,6 @@ #include <asm/setup.h> #include <asm/irq.h> -static inline void irq_dispose_mapping(unsigned int virq) -{ - return; -} - extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys); extern void arm_dt_memblock_reserve(void); |