diff options
Diffstat (limited to 'arch/ppc/kernel/traps.c')
-rw-r--r-- | arch/ppc/kernel/traps.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c index 9dbc4d28fa28..6d0a1838d94c 100644 --- a/arch/ppc/kernel/traps.c +++ b/arch/ppc/kernel/traps.c | |||
@@ -38,9 +38,6 @@ | |||
38 | #include <asm/io.h> | 38 | #include <asm/io.h> |
39 | #include <asm/reg.h> | 39 | #include <asm/reg.h> |
40 | #include <asm/xmon.h> | 40 | #include <asm/xmon.h> |
41 | #ifdef CONFIG_PMAC_BACKLIGHT | ||
42 | #include <asm/backlight.h> | ||
43 | #endif | ||
44 | #include <asm/pmc.h> | 41 | #include <asm/pmc.h> |
45 | 42 | ||
46 | #ifdef CONFIG_XMON | 43 | #ifdef CONFIG_XMON |
@@ -85,12 +82,6 @@ int die(const char * str, struct pt_regs * fp, long err) | |||
85 | int nl = 0; | 82 | int nl = 0; |
86 | console_verbose(); | 83 | console_verbose(); |
87 | spin_lock_irq(&die_lock); | 84 | spin_lock_irq(&die_lock); |
88 | #ifdef CONFIG_PMAC_BACKLIGHT | ||
89 | if (_machine == _MACH_Pmac) { | ||
90 | set_backlight_enable(1); | ||
91 | set_backlight_level(BACKLIGHT_MAX); | ||
92 | } | ||
93 | #endif | ||
94 | printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter); | 85 | printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter); |
95 | #ifdef CONFIG_PREEMPT | 86 | #ifdef CONFIG_PREEMPT |
96 | printk("PREEMPT "); | 87 | printk("PREEMPT "); |
@@ -159,7 +150,7 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr) | |||
159 | */ | 150 | */ |
160 | static inline int check_io_access(struct pt_regs *regs) | 151 | static inline int check_io_access(struct pt_regs *regs) |
161 | { | 152 | { |
162 | #if defined CONFIG_PPC_PMAC || defined CONFIG_8xx | 153 | #if defined CONFIG_8xx |
163 | unsigned long msr = regs->msr; | 154 | unsigned long msr = regs->msr; |
164 | const struct exception_table_entry *entry; | 155 | const struct exception_table_entry *entry; |
165 | unsigned int *nip = (unsigned int *)regs->nip; | 156 | unsigned int *nip = (unsigned int *)regs->nip; |
@@ -196,7 +187,7 @@ static inline int check_io_access(struct pt_regs *regs) | |||
196 | return 1; | 187 | return 1; |
197 | } | 188 | } |
198 | } | 189 | } |
199 | #endif /* CONFIG_PPC_PMAC */ | 190 | #endif /* CONFIG_8xx */ |
200 | return 0; | 191 | return 0; |
201 | } | 192 | } |
202 | 193 | ||