linux/drivers/net/ibm_newemac
Linus Torvalds 03c0c29aff 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.
2010-08-05 15:57:35 -07:00
..
core.c Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 2010-08-05 15:57:35 -07:00
core.h include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
debug.c of: Always use 'struct device.of_node' to get device node pointer. 2010-05-18 16:10:44 -06:00
debug.h of: Always use 'struct device.of_node' to get device node pointer. 2010-05-18 16:10:44 -06:00
emac.h ibm_newemac: Fix EMACx_TRTR[TRT] bit shifts 2009-11-18 05:11:09 -08:00
Kconfig Merge commit 'origin' 2008-10-15 11:31:54 +11:00
Makefile
mal.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
mal.h net: Add init_dummy_netdev() and fix EMAC driver using it 2009-01-14 21:05:05 -08:00
phy.c net: variables reach -1, but 0 tested 2009-02-02 21:39:02 -08:00
phy.h ibm_newemac: Add support for GPCS, SGMII and M88E1112 PHY 2008-10-02 13:06:42 -04:00
rgmii.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
rgmii.h
tah.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
tah.h
zmii.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
zmii.h