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/video/kyro/STG4000Reg.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/video/kyro/STG4000Reg.h')
| -rw-r--r-- | drivers/video/kyro/STG4000Reg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/kyro/STG4000Reg.h b/drivers/video/kyro/STG4000Reg.h index 244549e61368..5d6269882589 100644 --- a/drivers/video/kyro/STG4000Reg.h +++ b/drivers/video/kyro/STG4000Reg.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | /* | 17 | /* |
| 18 | * Macros that access memory mapped card registers in PCI space | 18 | * Macros that access memory mapped card registers in PCI space |
| 19 | * Add an appropraite section for your OS or processor architecture. | 19 | * Add an appropriate section for your OS or processor architecture. |
| 20 | */ | 20 | */ |
| 21 | #if defined(__KERNEL__) | 21 | #if defined(__KERNEL__) |
| 22 | #include <asm/page.h> | 22 | #include <asm/page.h> |