diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-21 16:18:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-21 16:18:05 -0800 |
| commit | 0f151e8b214c1df3f571020b849382933f2cdce7 (patch) | |
| tree | 9ae4bb3361e9d7e286674b1d59b9dc931c74caf1 /drivers/net | |
| parent | e80af3a8dbbbf431b2070cc760699f01c5a6ac69 (diff) | |
| parent | a8b87f609d1332216e683b473d33342c86f21ac3 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] pasemi: Remove warning in mpic_pasemi_msi.c
[POWERPC] pasemi: Register i2c devices at boot
[POWERPC] cell: fix spurious false return from spu_trap_data_{map,seg}
[POWERPC] Fix warning in pseries/power.c
[POWERPC] Fix bootwrapper builds with older gcc versions
[POWERPC] Fix dt_mem_next_cell() to read the full address
[POWERPC] Kill sparse warnings in kprobes
[POWERPC] spufs: fix scheduler starvation by idle contexts
[POWERPC] 44x: Add multiplatform defconfig
[POWERPC] 44x: Fix Kconfig formatting
[POWERPC] 4xx: Update defconfigs for 2.6.25
[POWERPC] 4xx: Remove "i2c" and "xxmii-interface" device_types from dts
[POWERPC] PPC440EP Interrupt Triggering and Level Settings
[POWERPC] net: NEWEMAC: Remove "rgmii-interface" from rgmii matching table
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ibm_newemac/rgmii.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ibm_newemac/rgmii.c index 9bc1132fa788..5757788227be 100644 --- a/drivers/net/ibm_newemac/rgmii.c +++ b/drivers/net/ibm_newemac/rgmii.c @@ -302,7 +302,6 @@ static int __devexit rgmii_remove(struct of_device *ofdev) static struct of_device_id rgmii_match[] = { { - .type = "rgmii-interface", .compatible = "ibm,rgmii", }, { |