Changeset 3704


Ignore:
Timestamp:
2006-04-24T14:09:31+02:00 (12 years ago)
Author:
florian
Message:

Merge 2.4 patches to 2.6 kernel.
Update kernel config

Location:
trunk/openwrt/target/linux/au1000-2.6
Files:
4 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/target/linux/au1000-2.6/config

    r3702 r3704  
    22# Automatically generated make config: don't edit 
    33# Linux kernel version: 2.6.16.7 
    4 # Sat Apr 22 16:46:55 2006 
     4# Sun Apr 23 13:43:59 2006 
    55# 
    66CONFIG_MIPS=y 
     
    677677CONFIG_BONDING=m 
    678678# CONFIG_EQUALIZER is not set 
    679 # CONFIG_IMQ is not set 
     679CONFIG_IMQ=m 
     680# CONFIG_IMQ_BEHAVIOR_AA is not set 
     681# CONFIG_IMQ_BEHAVIOR_AB is not set 
     682CONFIG_IMQ_BEHAVIOR_BA=y 
     683# CONFIG_IMQ_BEHAVIOR_BB is not set 
     684CONFIG_IMQ_NUM_DEVS=2 
    680685CONFIG_TUN=m 
    681686 
     
    876881# PCI-based Watchdog Cards 
    877882# 
    878 CONFIG_PCIPCWATCHDOG=m 
    879 CONFIG_WDTPCI=m 
    880 CONFIG_WDT_501_PCI=y 
     883# CONFIG_PCIPCWATCHDOG is not set 
     884# CONFIG_WDTPCI is not set 
    881885 
    882886# 
     
    884888# 
    885889# CONFIG_USBPCWATCHDOG is not set 
    886 CONFIG_RTC=m 
    887 CONFIG_GEN_RTC=m 
    888 CONFIG_GEN_RTC_X=y 
     890# CONFIG_RTC is not set 
     891# CONFIG_GEN_RTC is not set 
    889892# CONFIG_DTLK is not set 
    890893# CONFIG_R3964 is not set 
     
    12511254CONFIG_NFSD_V4=y 
    12521255CONFIG_NFSD_TCP=y 
    1253 CONFIG_ROOT_NFS=y 
     1256# CONFIG_ROOT_NFS is not set 
    12541257CONFIG_LOCKD=y 
    12551258CONFIG_LOCKD_V4=y 
  • trunk/openwrt/target/linux/au1000-2.6/patches/004-mtx1_watchdog.patch

    r3702 r3704  
    11diff -urN linux-2.6.16.7/drivers/char/watchdog/Kconfig linux-2.6.16.7.new/drivers/char/watchdog/Kconfig 
    22--- linux-2.6.16.7/drivers/char/watchdog/Kconfig        2006-04-17 23:53:25.000000000 +0200 
    3 +++ linux-2.6.16.7.new/drivers/char/watchdog/Kconfig    2006-04-22 16:40:32.000000000 +0200 
     3+++ linux-2.6.16.7.new/drivers/char/watchdog/Kconfig    2006-04-22 23:23:53.000000000 +0200 
    44@@ -460,6 +460,14 @@ 
    55          timer expired and no process has written to /dev/watchdog during 
     
    1919diff -urN linux-2.6.16.7/drivers/char/watchdog/Makefile linux-2.6.16.7.new/drivers/char/watchdog/Makefile 
    2020--- linux-2.6.16.7/drivers/char/watchdog/Makefile       2006-04-17 23:53:25.000000000 +0200 
    21 +++ linux-2.6.16.7.new/drivers/char/watchdog/Makefile   2006-04-22 16:38:31.000000000 +0200 
     21+++ linux-2.6.16.7.new/drivers/char/watchdog/Makefile   2006-04-22 23:21:18.000000000 +0200 
    2222@@ -65,6 +65,7 @@ 
    2323  
     
    3030diff -urN linux-2.6.16.7/drivers/char/watchdog/mtx-1_watchdog.c linux-2.6.16.7.new/drivers/char/watchdog/mtx-1_watchdog.c 
    3131--- linux-2.6.16.7/drivers/char/watchdog/mtx-1_watchdog.c       1970-01-01 01:00:00.000000000 +0100 
    32 +++ linux-2.6.16.7.new/drivers/char/watchdog/mtx-1_watchdog.c   2006-04-22 16:38:49.000000000 +0200 
    33 @@ -0,0 +1,252 @@ 
     32+++ linux-2.6.16.7.new/drivers/char/watchdog/mtx-1_watchdog.c   2006-04-22 23:20:53.000000000 +0200 
     33@@ -0,0 +1,246 @@ 
    3434+/* 
    3535+ *      Driver for the MTX-1 Watchdog. 
     
    120120+       if (timer_is_running) 
    121121+               mod_timer (&wd_trigger_timer, jiffies + 5 * HZ); 
    122 +       mtx1_trigger_wd (); 
     122+       mtx1_trigger_wd(); 
    123123+} 
    124124+ 
     
    242242+ 
    243243+ 
    244 +void cleanup_module (void) 
    245 +{ 
    246 +       // stop the timer, if it is running. 
    247 +       stop_wd_timer(); 
    248 + 
    249 +       misc_deregister(&mtx1wd_miscdev); 
    250 + 
    251 +       mtx1_disable_wd (); 
    252 +} 
    253 + 
    254 + 
    255244+static int __init init_mtx1_watchdog(void) 
    256245+{ 
     
    275264+static void __exit exit_mtx1_watchdog(void) { 
    276265+ 
     266+       // stop the timer, if it is running. 
     267+        stop_wd_timer(); 
     268+ 
    277269+        misc_deregister(&mtx1wd_miscdev); 
     270+ 
     271+        mtx1_disable_wd(); 
    278272+} 
    279273+ 
Note: See TracChangeset for help on using the changeset viewer.