Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci-2.6.23
Commits
0e016b9f
Commit
0e016b9f
authored
Nov 01, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
parents
fca324e7
de4ae58f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
3 deletions
+8
-3
drivers/char/watchdog/mpcore_wdt.c
drivers/char/watchdog/mpcore_wdt.c
+1
-0
drivers/char/watchdog/mv64x60_wdt.c
drivers/char/watchdog/mv64x60_wdt.c
+1
-0
drivers/char/watchdog/pcwd_pci.c
drivers/char/watchdog/pcwd_pci.c
+4
-2
drivers/char/watchdog/s3c2410_wdt.c
drivers/char/watchdog/s3c2410_wdt.c
+1
-0
drivers/char/watchdog/w83627hf_wdt.c
drivers/char/watchdog/w83627hf_wdt.c
+1
-1
No files found.
drivers/char/watchdog/mpcore_wdt.c
View file @
0e016b9f
...
@@ -396,6 +396,7 @@ static int __devexit mpcore_wdt_remove(struct device *dev)
...
@@ -396,6 +396,7 @@ static int __devexit mpcore_wdt_remove(struct device *dev)
}
}
static
struct
device_driver
mpcore_wdt_driver
=
{
static
struct
device_driver
mpcore_wdt_driver
=
{
.
owner
=
THIS_MODULE
,
.
name
=
"mpcore_wdt"
,
.
name
=
"mpcore_wdt"
,
.
bus
=
&
platform_bus_type
,
.
bus
=
&
platform_bus_type
,
.
probe
=
mpcore_wdt_probe
,
.
probe
=
mpcore_wdt_probe
,
...
...
drivers/char/watchdog/mv64x60_wdt.c
View file @
0e016b9f
...
@@ -213,6 +213,7 @@ static int __devexit mv64x60_wdt_remove(struct device *dev)
...
@@ -213,6 +213,7 @@ static int __devexit mv64x60_wdt_remove(struct device *dev)
}
}
static
struct
device_driver
mv64x60_wdt_driver
=
{
static
struct
device_driver
mv64x60_wdt_driver
=
{
.
owner
=
THIS_MODULE
,
.
name
=
MV64x60_WDT_NAME
,
.
name
=
MV64x60_WDT_NAME
,
.
bus
=
&
platform_bus_type
,
.
bus
=
&
platform_bus_type
,
.
probe
=
mv64x60_wdt_probe
,
.
probe
=
mv64x60_wdt_probe
,
...
...
drivers/char/watchdog/pcwd_pci.c
View file @
0e016b9f
/*
/*
* Berkshire PCI-PC Watchdog Card Driver
* Berkshire PCI-PC Watchdog Card Driver
*
*
* (c) Copyright 2003 Wim Van Sebroeck <wim@iguana.be>.
* (c) Copyright 2003
-2005
Wim Van Sebroeck <wim@iguana.be>.
*
*
* Based on source code of the following authors:
* Based on source code of the following authors:
* Ken Hollis <kenji@bitgate.com>,
* Ken Hollis <kenji@bitgate.com>,
...
@@ -21,7 +21,9 @@
...
@@ -21,7 +21,9 @@
*/
*/
/*
/*
* A bells and whistles driver is available from http://www.pcwd.de/
* A bells and whistles driver is available from:
* http://www.kernel.org/pub/linux/kernel/people/wim/pcwd/pcwd_pci/
*
* More info available at http://www.berkprod.com/ or http://www.pcwatchdog.com/
* More info available at http://www.berkprod.com/ or http://www.pcwatchdog.com/
*/
*/
...
...
drivers/char/watchdog/s3c2410_wdt.c
View file @
0e016b9f
...
@@ -497,6 +497,7 @@ static int s3c2410wdt_resume(struct device *dev)
...
@@ -497,6 +497,7 @@ static int s3c2410wdt_resume(struct device *dev)
static
struct
device_driver
s3c2410wdt_driver
=
{
static
struct
device_driver
s3c2410wdt_driver
=
{
.
owner
=
THIS_MODULE
,
.
name
=
"s3c2410-wdt"
,
.
name
=
"s3c2410-wdt"
,
.
bus
=
&
platform_bus_type
,
.
bus
=
&
platform_bus_type
,
.
probe
=
s3c2410wdt_probe
,
.
probe
=
s3c2410wdt_probe
,
...
...
drivers/char/watchdog/w83627hf_wdt.c
View file @
0e016b9f
...
@@ -359,5 +359,5 @@ module_exit(wdt_exit);
...
@@ -359,5 +359,5 @@ module_exit(wdt_exit);
MODULE_LICENSE
(
"GPL"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_AUTHOR
(
"Pdraig Brady <P@draigBrady.com>"
);
MODULE_AUTHOR
(
"Pdraig Brady <P@draigBrady.com>"
);
MODULE_DESCRIPTION
(
"w
38
627hf WDT driver"
);
MODULE_DESCRIPTION
(
"w
83
627hf WDT driver"
);
MODULE_ALIAS_MISCDEV
(
WATCHDOG_MINOR
);
MODULE_ALIAS_MISCDEV
(
WATCHDOG_MINOR
);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment