Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (63 commits) of/platform: Register of_platform_drivers with an "of:" prefix of/address: Clean up function declarations of/spi: call of_register_spi_devices() from spi core code of: Provide default of_node_to_nid() implementation. of/device: Make of_device_make_bus_id() usable by other code. of/irq: Fix endian issues in parsing interrupt specifiers of: Fix phandle endian issues of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string of: remove of_default_bus_ids of: make of_find_device_by_node generic microblaze: remove references to of_device and to_of_device sparc: remove references to of_device and to_of_device powerpc: remove references to of_device and to_of_device of/device: Replace of_device with platform_device in includes and core code of/device: Protect against binding of_platform_drivers to non-OF devices of: remove asm/of_device.h of: remove asm/of_platform.h of/platform: remove all of_bus_type and of_platform_bus_type references of: Merge of_platform_bus_type with platform_bus_type drivercore/of: Add OF style matching to platform bus ... Fix up trivial conflicts in arch/microblaze/kernel/Makefile due to just some obj-y removals by the devicetree branch, while the microblaze updates added a new file.
No related branches found
No related tags found
Showing
- arch/microblaze/Kconfig 2 additions, 15 deletionsarch/microblaze/Kconfig
- arch/microblaze/include/asm/irq.h 0 additions, 24 deletionsarch/microblaze/include/asm/irq.h
- arch/microblaze/include/asm/of_device.h 0 additions, 44 deletionsarch/microblaze/include/asm/of_device.h
- arch/microblaze/include/asm/of_platform.h 0 additions, 54 deletionsarch/microblaze/include/asm/of_platform.h
- arch/microblaze/include/asm/page.h 0 additions, 7 deletionsarch/microblaze/include/asm/page.h
- arch/microblaze/include/asm/pci-bridge.h 0 additions, 5 deletionsarch/microblaze/include/asm/pci-bridge.h
- arch/microblaze/include/asm/prom.h 14 additions, 101 deletionsarch/microblaze/include/asm/prom.h
- arch/microblaze/include/asm/topology.h 0 additions, 10 deletionsarch/microblaze/include/asm/topology.h
- arch/microblaze/kernel/Makefile 2 additions, 2 deletionsarch/microblaze/kernel/Makefile
- arch/microblaze/kernel/irq.c 2 additions, 12 deletionsarch/microblaze/kernel/irq.c
- arch/microblaze/kernel/of_device.c 0 additions, 112 deletionsarch/microblaze/kernel/of_device.c
- arch/microblaze/kernel/of_platform.c 0 additions, 200 deletionsarch/microblaze/kernel/of_platform.c
- arch/microblaze/kernel/prom_parse.c 1 addition, 876 deletionsarch/microblaze/kernel/prom_parse.c
- arch/microblaze/kernel/reset.c 6 additions, 6 deletionsarch/microblaze/kernel/reset.c
- arch/microblaze/kernel/setup.c 0 additions, 6 deletionsarch/microblaze/kernel/setup.c
- arch/powerpc/Kconfig 2 additions, 16 deletionsarch/powerpc/Kconfig
- arch/powerpc/include/asm/irq.h 0 additions, 28 deletionsarch/powerpc/include/asm/irq.h
- arch/powerpc/include/asm/macio.h 1 addition, 1 deletionarch/powerpc/include/asm/macio.h
- arch/powerpc/include/asm/of_device.h 0 additions, 27 deletionsarch/powerpc/include/asm/of_device.h
- arch/powerpc/include/asm/of_platform.h 0 additions, 29 deletionsarch/powerpc/include/asm/of_platform.h
Loading
Please register or sign in to comment