diff options
| author | Greg KH <greg@press.(none)> | 2005-06-28 01:07:56 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-28 01:07:56 -0400 |
| commit | 8644d2a42bdba2d513f71c07eaf1b6f9b718b8eb (patch) | |
| tree | c43b6c2fdf1b68b66906a2de69446dcec0f9af6b /drivers/char/misc.c | |
| parent | 1cde8a16815bd85c8137d1ea556398983c597c11 (diff) | |
| parent | 99f95e5286df2f69edab8a04c7080d986ee4233b (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/misc.c')
| -rw-r--r-- | drivers/char/misc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/misc.c b/drivers/char/misc.c index 31cf84d69026..931efd58f87a 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c | |||
| @@ -309,9 +309,6 @@ static int __init misc_init(void) | |||
| 309 | #ifdef CONFIG_BVME6000 | 309 | #ifdef CONFIG_BVME6000 |
| 310 | rtc_DP8570A_init(); | 310 | rtc_DP8570A_init(); |
| 311 | #endif | 311 | #endif |
| 312 | #ifdef CONFIG_PMAC_PBOOK | ||
| 313 | pmu_device_init(); | ||
| 314 | #endif | ||
| 315 | if (register_chrdev(MISC_MAJOR,"misc",&misc_fops)) { | 312 | if (register_chrdev(MISC_MAJOR,"misc",&misc_fops)) { |
| 316 | printk("unable to get major %d for misc devices\n", | 313 | printk("unable to get major %d for misc devices\n", |
| 317 | MISC_MAJOR); | 314 | MISC_MAJOR); |