diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-30 10:28:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-11-30 10:28:09 -0800 |
| commit | 90bf80a1f110426433d6d3e77f5143b58b41165c (patch) | |
| tree | 13c98a4d019607a907fbabdb0bcc1b64af746945 /drivers/net/wan | |
| parent | 50a561ca1bd1151c78a2412e6a990fda15eb434d (diff) | |
| parent | 0d2c9f0517e915ce03a04e91d3207827e0d274a8 (diff) | |
| download | linux-90bf80a1f110426433d6d3e77f5143b58b41165c.tar.gz linux-90bf80a1f110426433d6d3e77f5143b58b41165c.tar.bz2 linux-90bf80a1f110426433d6d3e77f5143b58b41165c.zip | |
Merge tag 'ixp4xx-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM ixp4xx bug fixes from Arnd Bergmann:
"These were originally prepared by Krzysztof Halasa but not submitted
in time for v3.7 due to some confusion about how ixp4xx patches should
be handled. Jason Cooper thankfully offered to help out sending the
patches upstream through arm-soc now, but given the timing, we could
as well delay them for 3.8."
* tag 'ixp4xx-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
IXP4xx: use __iomem for MMIO
IXP4xx: map CPU config registers within VMALLOC region.
IXP4xx: Always ioremap() Queue Manager MMIO region at boot.
ixp4xx: Declare MODULE_FIRMWARE usage
IXP4xx crypto: MOD_AES{128,192,256} already include key size.
WAN: Remove redundant HDLC info printed by IXP4xx HSS driver.
IXP4xx: Remove time limit for PCI TRDY to enable use of slow devices.
IXP4xx: ixp4xx_crypto driver requires Queue Manager and NPE drivers.
IXP4xx: HW pseudo-random generator is available on IXP45x/46x only.
IXP4xx: Fix off-by-one bug in Goramo MultiLink platform.
IXP4xx: Fix Goramo MultiLink platform compilation.
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/ixp4xx_hss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c index e9a3da588e95..760776b3d66c 100644 --- a/drivers/net/wan/ixp4xx_hss.c +++ b/drivers/net/wan/ixp4xx_hss.c @@ -1365,7 +1365,7 @@ static int __devinit hss_init_one(struct platform_device *pdev) platform_set_drvdata(pdev, port); - netdev_info(dev, "HSS-%i\n", port->id); + netdev_info(dev, "initialized\n"); return 0; err_free_netdev: |