diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /include/linux/ac97_codec.h | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'include/linux/ac97_codec.h')
| -rw-r--r-- | include/linux/ac97_codec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ac97_codec.h b/include/linux/ac97_codec.h index c35833824e11..2ed2fd855133 100644 --- a/include/linux/ac97_codec.h +++ b/include/linux/ac97_codec.h | |||
| @@ -259,7 +259,7 @@ struct ac97_codec { | |||
| 259 | int type; | 259 | int type; |
| 260 | u32 model; | 260 | u32 model; |
| 261 | 261 | ||
| 262 | int modem:1; | 262 | unsigned int modem:1; |
| 263 | 263 | ||
| 264 | struct ac97_ops *codec_ops; | 264 | struct ac97_ops *codec_ops; |
| 265 | 265 | ||