diff options
| author | wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-09-11 11:46:25 +0000 |
|---|---|---|
| committer | wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-09-11 11:46:25 +0000 |
| commit | 20f935273030fe4774a2243e2ef7f6d91daf390a (patch) | |
| tree | 2bcf1bfdfbfc32aab2370a901617ae4ea813caf0 /openwrt/target/linux/linux-2.6/patches | |
| parent | 21f7d0efb399a68182eb8d2b0ad85d6dede538c5 (diff) | |
add ppp/pppoe to kernel config, remove some compile warnings (cli->local_irq_disable)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1903 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/target/linux/linux-2.6/patches')
| -rw-r--r-- | openwrt/target/linux/linux-2.6/patches/brcm/001-bcm947xx.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openwrt/target/linux/linux-2.6/patches/brcm/001-bcm947xx.patch b/openwrt/target/linux/linux-2.6/patches/brcm/001-bcm947xx.patch index 907f37a27c..649028d89f 100644 --- a/openwrt/target/linux/linux-2.6/patches/brcm/001-bcm947xx.patch +++ b/openwrt/target/linux/linux-2.6/patches/brcm/001-bcm947xx.patch @@ -12587,7 +12587,7 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/prom.c linux-2.6.12.5-brcm/arch/mips +} diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/setup.c linux-2.6.12.5-brcm/arch/mips/bcm947xx/setup.c --- linux-2.6.12.5/arch/mips/bcm947xx/setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/setup.c 2005-08-28 16:57:28.317825624 +0200 ++++ linux-2.6.12.5-brcm/arch/mips/bcm947xx/setup.c 2005-09-11 01:36:10.217667456 +0200 @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org) @@ -12684,7 +12684,7 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/setup.c linux-2.6.12.5-brcm/arch/mip +static void bcm47xx_machine_restart(char *command) +{ + /* Set the watchdog timer to reset immediately */ -+ cli(); ++ local_irq_disable(); + sb_watchdog(sbh, 1); + while (1); +} @@ -12692,7 +12692,7 @@ diff -Nur linux-2.6.12.5/arch/mips/bcm947xx/setup.c linux-2.6.12.5-brcm/arch/mip +static void bcm47xx_machine_halt(void) +{ + /* Disable interrupts and watchdog and spin forever */ -+ cli(); ++ local_irq_disable(); + sb_watchdog(sbh, 0); + while (1); +} |