diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-06-27 17:36:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 18:11:43 -0400 |
commit | 8c8709334cec803368a432a33e0f2e116d48fe07 (patch) | |
tree | f3298ae6d844e548c36df9fc3bfb5a3662d4e45d /drivers/char/misc.c | |
parent | fcd16cc084f2b98ab64d27721abdb941f3d9c4cb (diff) |
[PATCH] ppc32: Remove CONFIG_PMAC_PBOOK
This patch removes CONFIG_PMAC_PBOOK (PowerBook support). This is now
split into CONFIG_PMAC_MEDIABAY for the actual hotswap bay that some
powerbooks have, CONFIG_PM for power management related code, and just left
out of any CONFIG_* option for some generally useful stuff that can be used
on non-laptops as well.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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); |