Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

67d2c36e

Commit 67d2c36e authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge watchdog driver updates

Automated merge from

	master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

failed due to duplicate different changes to Kconfig file. Manually fixed
up. Hopefully.

parents 94f8c66e 1cc77248

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

drivers/char/watchdog/Makefile 48 additions, 23 deletions

drivers/char/watchdog/Makefile
drivers/char/watchdog/ixp2000_wdt.c 1 addition, 1 deletion

drivers/char/watchdog/ixp2000_wdt.c
drivers/char/watchdog/ixp4xx_wdt.c 1 addition, 1 deletion

drivers/char/watchdog/ixp4xx_wdt.c
drivers/char/watchdog/s3c2410_wdt.c 55 additions, 32 deletions

drivers/char/watchdog/s3c2410_wdt.c
drivers/char/watchdog/scx200_wdt.c 1 addition, 1 deletion

drivers/char/watchdog/scx200_wdt.c
drivers/char/watchdog/softdog.c 9 additions, 4 deletions

drivers/char/watchdog/softdog.c
drivers/char/watchdog/w83627hf_wdt.c 6 additions, 0 deletions

drivers/char/watchdog/w83627hf_wdt.c

with 121 additions and 62 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment