diff options
| author | Deepak Saxena <dsaxena@laptop.org> | 2008-08-10 14:06:08 -0700 |
|---|---|---|
| committer | Deepak Saxena <dsaxena@laptop.org> | 2008-08-10 14:06:08 -0700 |
| commit | 0bc186239fb1afa2dbc83f02f745e6290d664d70 (patch) | |
| tree | 0b0e40752e0597d9aa0d3b63ae1497b405d1977d /include | |
| parent | f5931acac40cff4ec59a12db54570d0c2cb3cd91 (diff) | |
| parent | 3563ed56ad1ddc4691d082cb6af5ab7d2618ffa0 (diff) | |
| download | lwn-0bc186239fb1afa2dbc83f02f745e6290d664d70.tar.gz lwn-0bc186239fb1afa2dbc83f02f745e6290d664d70.zip | |
Merge commit 'v2.6.25.15' into olpc-testing
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/msdos_fs.h | 6 | ||||
| -rw-r--r-- | include/sound/ac97_codec.h | 1 | ||||
| -rw-r--r-- | include/sound/emu10k1.h | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h index f950921523f5..20277adf16cb 100644 --- a/include/linux/msdos_fs.h +++ b/include/linux/msdos_fs.h @@ -58,7 +58,11 @@ #define MSDOS_DOTDOT ".. " /* "..", padded to MSDOS_NAME chars */ /* media of boot sector */ -#define FAT_VALID_MEDIA(x) ((0xF8 <= (x) && (x) <= 0xFF) || (x) == 0xF0) +static inline int fat_valid_media(u8 media) +{ + return 0xf8 <= media || media == 0xf0; +} + #define FAT_FIRST_ENT(s, x) ((MSDOS_SB(s)->fat_bits == 32 ? 0x0FFFFF00 : \ MSDOS_SB(s)->fat_bits == 16 ? 0xFF00 : 0xF00) | (x)) diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index 25d121e87acb..1d853e04cdbe 100644 --- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h @@ -506,6 +506,7 @@ struct snd_ac97 { unsigned short pcmreg[3]; // PCM registers unsigned short codec_cfg[3]; // CODEC_CFG bits unsigned char swap_mic_linein; // AD1986/AD1986A only + unsigned char lo_as_master; /* LO as master */ } ad18xx; unsigned int dev_flags; /* device specific */ } spec; diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 7b7b9b13b4dd..10ee28eac018 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -1670,6 +1670,7 @@ struct snd_emu_chip_details { unsigned char spi_dac; /* SPI interface for DAC */ unsigned char i2c_adc; /* I2C interface for ADC */ unsigned char adc_1361t; /* Use Philips 1361T ADC */ + unsigned char invert_shared_spdif; /* analog/digital switch inverted */ const char *driver; const char *name; const char *id; /* for backward compatibility - can be NULL if not needed */ |