diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2003-05-29 22:39:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2003-05-29 22:39:32 -0700 |
| commit | 4df914aa2c069c96d67e49c4d0e135cca8cb683e (patch) | |
| tree | f2c65e97ec2f222c4571ee573fc4f5e57354a7d2 /include/linux | |
| parent | 0bfd72a7f2b172f7b7df68ba5b2f6f4e9884bcb5 (diff) | |
| parent | f62b69ad6a0844979f8cdab3e090c07fc06c2dcd (diff) | |
Merge bk://kernel.bkbits.net/gregkh/linux/linus-2.5
into penguin.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 78b45c4afd9c..9ae05e3ff093 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1059,7 +1059,7 @@ extern void bd_release(struct block_device *); extern void blk_run_queues(void); /* fs/char_dev.c */ -extern int alloc_chrdev_region(dev_t *, unsigned, char *); +extern int alloc_chrdev_region(dev_t *, unsigned, unsigned, char *); extern int register_chrdev_region(dev_t, unsigned, char *); extern int register_chrdev(unsigned int, const char *, struct file_operations *); |