diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-07 12:18:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-07 12:18:52 -0800 |
| commit | 02550d61f49266930e674286379d3601006b2893 (patch) | |
| tree | 2d30df688b7f428908028dd20e83b22bc799dee7 /arch/arm/include | |
| parent | 2d51daaa615e4724f24e43fa01e705c40551080a (diff) | |
| parent | c89810acbcf48c7004e912b2b4b862480b2d00e1 (diff) | |
| download | blackbird-op-linux-02550d61f49266930e674286379d3601006b2893.tar.gz blackbird-op-linux-02550d61f49266930e674286379d3601006b2893.zip | |
Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6
devicetree/next changes queued for v3.3 merge window
* tag 'devicetree-for-linus-20120104' of git://git.secretlab.ca/git/linux-2.6:
ARM: prom.h: Fix build error by removing unneeded header file
irq: check domain hwirq range for DT translate
dt: add empty of_get_node/of_put_node functions
of/pdt: fix section mismatch warning
i2c-designware: add OF binding support
dt/i2c: Enumerate some of the known trivial i2c devices
dt: reform for_each_property to for_each_property_of_node
ARM/of: allow *machine_desc.dt_compat to be const
of/base: Take NULL string into account for property with multiple strings
OF/device-tree: Add some entries to vendor-prefixes.txt
Fix up trivial add-add conflicts in include/linux/of.h
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/mach/arch.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/prom.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h index bcb0c883e21e..d7692cafde7f 100644 --- a/arch/arm/include/asm/mach/arch.h +++ b/arch/arm/include/asm/mach/arch.h @@ -19,7 +19,7 @@ struct machine_desc { unsigned int nr; /* architecture number */ const char *name; /* architecture name */ unsigned long atag_offset; /* tagged list (relative) */ - const char **dt_compat; /* array of device tree + const char *const *dt_compat; /* array of device tree * 'compatible' strings */ unsigned int nr_irqs; /* number of IRQs */ diff --git a/arch/arm/include/asm/prom.h b/arch/arm/include/asm/prom.h index 6f65ca86a5ec..ee0363307918 100644 --- a/arch/arm/include/asm/prom.h +++ b/arch/arm/include/asm/prom.h @@ -13,7 +13,6 @@ #ifdef CONFIG_OF -#include <asm/setup.h> #include <asm/irq.h> extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys); |
