diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 00:06:26 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-24 00:06:26 -0700 |
commit | b73077eb03f510a84b102fb97640e595a958403c (patch) | |
tree | 8b639000418e2756bf6baece4e00e07d2534bccc /drivers/video/kyro/STG4000Reg.h | |
parent | Input: ads7846 - remove unused variable from struct ads7845_ser_req (diff) | |
parent | Input: ADP5589 - new driver for I2C Keypad Decoder and I/O Expander (diff) | |
download | linux-dev-b73077eb03f510a84b102fb97640e595a958403c.tar.xz linux-dev-b73077eb03f510a84b102fb97640e595a958403c.zip |
Merge branch 'next' into for-linus
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 @@ /* * Macros that access memory mapped card registers in PCI space - * Add an appropraite section for your OS or processor architecture. + * Add an appropriate section for your OS or processor architecture. */ #if defined(__KERNEL__) #include <asm/page.h> |