diff options
| author |   Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 22:19:40 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 22:19:40 +0100 |
| commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
| tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /drivers/char/misc.c | |
| parent | NTFS: Fix a nasty deadlock that appeared in recent kernels. (diff) | |
| parent | Merge 'drm-3264' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
| download | linux-dev-2a322e4c08be4e7cb0c04b427ddaaa679fd88863.tar.xz linux-dev-2a322e4c08be4e7cb0c04b427ddaaa679fd88863.zip | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'drivers/char/misc.c')
| -rw-r--r-- | drivers/char/misc.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/char/misc.c b/drivers/char/misc.c index 3115d318b997..31cf84d69026 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c @@ -66,8 +66,6 @@ static unsigned char misc_minors[DYNAMIC_MINORS / 8]; extern int rtc_DP8570A_init(void); extern int rtc_MK48T08_init(void); extern int pmu_device_init(void); -extern int tosh_init(void); -extern int i8k_init(void); #ifdef CONFIG_PROC_FS static void *misc_seq_start(struct seq_file *seq, loff_t *pos) @@ -314,12 +312,6 @@ static int __init misc_init(void) #ifdef CONFIG_PMAC_PBOOK pmu_device_init(); #endif -#ifdef CONFIG_TOSHIBA - tosh_init(); -#endif -#ifdef CONFIG_I8K - i8k_init(); -#endif if (register_chrdev(MISC_MAJOR,"misc",&misc_fops)) { printk("unable to get major %d for misc devices\n", MISC_MAJOR); |