aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/linux-2.6
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openwrt.org>2005-09-11 11:46:25 +0000
committerWaldemar Brodkorb <wbx@openwrt.org>2005-09-11 11:46:25 +0000
commitb525bcb90dfd94d7a7d32c6d621007a117c9fd88 (patch)
tree62516e990aa0ae8386035a3166ac8ec1c69eb46c /target/linux/linux-2.6
parent1b4ca9701f75420b8e19e85844e81da91989992d (diff)
downloadmaster-187ad058-b525bcb90dfd94d7a7d32c6d621007a117c9fd88.tar.gz
master-187ad058-b525bcb90dfd94d7a7d32c6d621007a117c9fd88.tar.bz2
master-187ad058-b525bcb90dfd94d7a7d32c6d621007a117c9fd88.zip
add ppp/pppoe to kernel config, remove some compile warnings (cli->local_irq_disable)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1903 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/linux-2.6')
-rw-r--r--target/linux/linux-2.6/config/brcm11
-rw-r--r--target/linux/linux-2.6/patches/brcm/001-bcm947xx.patch6
2 files changed, 12 insertions, 5 deletions
diff --git a/target/linux/linux-2.6/config/brcm b/target/linux/linux-2.6/config/brcm
index 71fb6c6bdf..69c7f06b69 100644
--- a/target/linux/linux-2.6/config/brcm
+++ b/target/linux/linux-2.6/config/brcm
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.12.5
-# Sun Sep 11 01:08:40 2005
+# Sun Sep 11 12:19:48 2005
#
CONFIG_MIPS=y
# CONFIG_MIPS64 is not set
@@ -660,7 +660,14 @@ CONFIG_NET_WIRELESS=y
# CONFIG_WAN is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
-# CONFIG_PPP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
# CONFIG_SLIP is not set
# CONFIG_NET_FC is not set
# CONFIG_SHAPER is not set
diff --git a/target/linux/linux-2.6/patches/brcm/001-bcm947xx.patch b/target/linux/linux-2.6/patches/brcm/001-bcm947xx.patch
index 907f37a27c..649028d89f 100644
--- a/target/linux/linux-2.6/patches/brcm/001-bcm947xx.patch
+++ b/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);
+}