diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 10:58:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 10:58:05 -0800 |
| commit | 8b4b6707ee32f929846d947d18b1b9bf42e988aa (patch) | |
| tree | aa27dd01e2d74cb68efc4ab57eb4d1f4e563ae33 /include | |
| parent | d04ef3a795b3b7b376a02713ed5e211e9ae1f917 (diff) | |
| parent | 116f232b3794a8b6ebde21aef5004b18cc1cfa86 (diff) | |
| download | linux-8b4b6707ee32f929846d947d18b1b9bf42e988aa.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
fixed path to moved file in include/linux/device.h
Fix spelling in E1000_DISABLE_PACKET_SPLIT Kconfig description
Documentation/dvb/get_dvb_firmware: fix firmware URL
Documentation: Update to BUG-HUNTING
Remove superfluous NOTIFY_COOKIE_LEN define
add "tags" to .gitignore
Fix "frist", "fisrt", typos
fix rwlock usage example
It's UTF-8
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/termbits.h | 2 | ||||
| -rw-r--r-- | include/linux/device.h | 2 | ||||
| -rw-r--r-- | include/linux/msdos_fs.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-mips/termbits.h b/include/asm-mips/termbits.h index c29c65b7818e0..fa6d04dac56bf 100644 --- a/include/asm-mips/termbits.h +++ b/include/asm-mips/termbits.h @@ -77,7 +77,7 @@ struct termios { #define IXANY 0004000 /* Any character will restart after stop. */ #define IXOFF 0010000 /* Enable start/stop input control. */ #define IMAXBEL 0020000 /* Ring bell when input queue is full. */ -#define IUTF8 0040000 /* Input is UTF8 */ +#define IUTF8 0040000 /* Input is UTF-8 */ /* c_oflag bits */ #define OPOST 0000001 /* Perform output processing. */ diff --git a/include/linux/device.h b/include/linux/device.h index 6d2345d860829..f6e72a65a3f21 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -400,7 +400,7 @@ extern struct device * get_device(struct device * dev); extern void put_device(struct device * dev); -/* drivers/base/power.c */ +/* drivers/base/power/shutdown.c */ extern void device_shutdown(void); diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h index e933e2a355adc..8bcd9450d9261 100644 --- a/include/linux/msdos_fs.h +++ b/include/linux/msdos_fs.h @@ -199,7 +199,7 @@ struct fat_mount_options { sys_immutable:1, /* set = system files are immutable */ dotsOK:1, /* set = hidden and system files are named '.filename' */ isvfat:1, /* 0=no vfat long filename support, 1=vfat support */ - utf8:1, /* Use of UTF8 character set (Default) */ + utf8:1, /* Use of UTF-8 character set (Default) */ unicode_xlate:1, /* create escape sequences for unhandled Unicode */ numtail:1, /* Does first alias have a numeric '~1' type tail? */ atari:1, /* Use Atari GEMDOS variation of MS-DOS fs */ |