diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/isdn/hisax/hfc_usb.h | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/isdn/hisax/hfc_usb.h')
| -rw-r--r-- | drivers/isdn/hisax/hfc_usb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/hfc_usb.h b/drivers/isdn/hisax/hfc_usb.h index e79f56568d30..2f581c0b4693 100644 --- a/drivers/isdn/hisax/hfc_usb.h +++ b/drivers/isdn/hisax/hfc_usb.h | |||
| @@ -126,7 +126,7 @@ static struct hfcusb_symbolic_list urb_errlist[] = { | |||
| 126 | 126 | ||
| 127 | 127 | ||
| 128 | /* | 128 | /* |
| 129 | * device dependant information to support different | 129 | * device dependent information to support different |
| 130 | * ISDN Ta's using the HFC-S USB chip | 130 | * ISDN Ta's using the HFC-S USB chip |
| 131 | */ | 131 | */ |
| 132 | 132 | ||