summaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
authorCarsten Schlote <c.schlote@konzeptpark.de>2008-02-13 16:15:55 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2008-02-21 15:07:49 +0100
commit1fd9c5a05c48a635aba4723e09a6e27f0174099b (patch)
tree45a996f59984e8af1bef5e76b8b12b08609e9c92 /arch/ppc
parenta28726cf516e331a96c0976fb2afb5ff6fb1625a (diff)
downloadbarebox-1fd9c5a05c48a635aba4723e09a6e27f0174099b.tar.gz
barebox-1fd9c5a05c48a635aba4723e09a6e27f0174099b.tar.xz
[ppc] Fixed orphaned CONFIG_INTERRUPTS
Changed CONFIG to CONFIG_USE_IRQ Signed-off-by: Carsten Schlote <c.schlote@konzeptpark.de>
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/lib/Makefile2
-rw-r--r--arch/ppc/lib/board.c2
-rw-r--r--arch/ppc/mach-mpc5xxx/Makefile2
-rw-r--r--arch/ppc/mach-mpc5xxx/start.S4
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/ppc/lib/Makefile b/arch/ppc/lib/Makefile
index f893464d76..400b1e128d 100644
--- a/arch/ppc/lib/Makefile
+++ b/arch/ppc/lib/Makefile
@@ -2,7 +2,7 @@ obj-y += bat_rw.o
obj-y += board.o
obj-y += cache.o
obj-y += extable.o
-obj-$(CONFIG_INTERRUPTS) += interrupts.o
+obj-$(CONFIG_USE_IRQ) += interrupts.o
obj-y += kgdb.o
obj-y += ppcstring.o
obj-y += ticks.o
diff --git a/arch/ppc/lib/board.c b/arch/ppc/lib/board.c
index d0cd42cfdc..44522007d8 100644
--- a/arch/ppc/lib/board.c
+++ b/arch/ppc/lib/board.c
@@ -81,7 +81,7 @@ void board_init_r (ulong end_of_ram)
/*
* Enable Interrupts
*/
-#ifdef CONFIG_INTERRUPTS
+#ifdef CONFIG_USE_IRQ
interrupt_init ();
#endif
diff --git a/arch/ppc/mach-mpc5xxx/Makefile b/arch/ppc/mach-mpc5xxx/Makefile
index e75f1d1e66..e07062cb29 100644
--- a/arch/ppc/mach-mpc5xxx/Makefile
+++ b/arch/ppc/mach-mpc5xxx/Makefile
@@ -5,7 +5,7 @@ obj-y += speed.o
obj-y += traps.o
extra-y += start.o
obj-$(CONFIG_MPC5200) += firmware_sc_task_bestcomm.impl.o
-obj-$(CONFIG_INTERRUPTS) += interrupts.o
+obj-$(CONFIG_USE_IRQ) += interrupts.o
obj-$(CONFIG_REGINFO) += reginfo.o
#obj-y += firmware_sc_task.impl.o
diff --git a/arch/ppc/mach-mpc5xxx/start.S b/arch/ppc/mach-mpc5xxx/start.S
index 0c87e6b3d1..19556df16e 100644
--- a/arch/ppc/mach-mpc5xxx/start.S
+++ b/arch/ppc/mach-mpc5xxx/start.S
@@ -186,7 +186,7 @@ _start_of_vectors:
STD_EXCEPTION(0x400, InstStorage, UnknownException)
/* External Interrupt exception. */
-#ifdef CONFIG_INTERRUPTS
+#ifdef CONFIG_USE_IRQ
STD_EXCEPTION(0x500, ExtInterrupt, external_interrupt)
#endif
@@ -229,7 +229,7 @@ ProgramCheck:
/* I guess we could implement decrementer, and may have
* to someday for timekeeping.
*/
-#ifdef CONFIG_INTERRUPTS
+#ifdef CONFIG_USE_IRQ
STD_EXCEPTION(0x900, Decrementer, timer_interrupt)
#else
STD_EXCEPTION(0x900, Decrementer, UnknownException)