diff options
| author | David S. Miller <davem@davemloft.net> | 2013-01-15 21:05:59 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-15 21:05:59 +0100 |
| commit | 4b87f922598acf91eee18f71688a33f54f57bcde (patch) | |
| tree | 9cdfe30c6b96c47093da5392ed82d147290cd64c /drivers/ps3/ps3av.c | |
| parent | drivers/net: delete orphaned MCA ibmlana driver content (diff) | |
| parent | tg3: Fix crc errors on jumbo frame receive (diff) | |
| download | linux-4b87f922598acf91eee18f71688a33f54f57bcde.tar.xz linux-4b87f922598acf91eee18f71688a33f54f57bcde.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ps3/ps3av.c')
| -rw-r--r-- | drivers/ps3/ps3av.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ps3/ps3av.c b/drivers/ps3/ps3av.c index 93d0a8b7718a..437fc35beb7b 100644 --- a/drivers/ps3/ps3av.c +++ b/drivers/ps3/ps3av.c @@ -932,7 +932,7 @@ int ps3av_audio_mute(int mute) } EXPORT_SYMBOL_GPL(ps3av_audio_mute); -static int __devinit ps3av_probe(struct ps3_system_bus_device *dev) +static int ps3av_probe(struct ps3_system_bus_device *dev) { int res; int id; |