diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-13 15:49:00 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-13 15:49:00 -0700 |
| commit | 5353ec2cd13deb4f70aef1dcd296cadaac3f780b (patch) | |
| tree | a1309e1bf4332e4b792f53eadaf47d0c97959d31 /drivers/net/wireless/iwlwifi/iwl-6000.c | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
| parent | bb60424af517d6e6148505fb5ef256caa91b5b43 (diff) | |
Merge branch 'fix-smsc911x-regulator' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren:
"Here's one more kernel panic fix that I dropped from last weeks
fixes as it was still being discussed.
This is a fix for the regression caused by fixing an earlier
regression for smsc911x fixed regulators :(
Turns out that we have more than one smsc911x on some boards,
and the earlier fix causes a kernel panic for board trying to
register second smsc911x instance, even if the second smsc911x
is on an add-on board that is not connected.
Note that the boards with second smsc911x will also need to be
patched later on to provide their own regulators."
* 'fix-smsc911x-regulator' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: gpmc-smsc911x: only register regulator for first instance
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
0 files changed, 0 insertions, 0 deletions