diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-09-11 07:43:16 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-09-11 07:43:49 -0400 |
| commit | 998052b74574699bdd1e451b6556e4d7667a7a4e (patch) | |
| tree | 3124898e873cdec28f724106e60d1bff760505f1 /sound/pci/ctxfi | |
| parent | e7e69265b6269763799a5de9c263fbbce32cd3a3 (diff) | |
| parent | 7a9744cb455e6faa287e148394b4b422a6f3c5c4 (diff) | |
Merge branch 'for-linus' into for-next
Merging for-linus branch for syncing the latest STAC/IDT codec
changes to be affected by the upcoming hda-jack rewrites.
Diffstat (limited to 'sound/pci/ctxfi')
| -rw-r--r-- | sound/pci/ctxfi/ct20k1reg.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/pci/ctxfi/ct20k1reg.h b/sound/pci/ctxfi/ct20k1reg.h index f2e34e3f27ee..5851249f11d9 100644 --- a/sound/pci/ctxfi/ct20k1reg.h +++ b/sound/pci/ctxfi/ct20k1reg.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #ifndef CT20K1REG_H | 9 | #ifndef CT20K1REG_H |
| 10 | #define CT20k1REG_H | 10 | #define CT20K1REG_H |
| 11 | 11 | ||
| 12 | /* 20k1 registers */ | 12 | /* 20k1 registers */ |
| 13 | #define DSPXRAM_START 0x000000 | 13 | #define DSPXRAM_START 0x000000 |
| @@ -632,5 +632,3 @@ | |||
| 632 | #define I2SD_R 0x19L | 632 | #define I2SD_R 0x19L |
| 633 | 633 | ||
| 634 | #endif /* CT20K1REG_H */ | 634 | #endif /* CT20K1REG_H */ |
| 635 | |||
| 636 | |||