diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 17:53:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 17:53:53 -0400 |
| commit | 871039f02f8ec4ab2e5e9010718caa8e085786f1 (patch) | |
| tree | f0d2b3127fc48c862967d68c46c2d46668137515 /Documentation/watchdog/watchdog-api.txt | |
| parent | e4077e018b5ead3de9951fc01d8bf12eeeeeefed (diff) | |
| parent | 4a1032faac94ebbf647460ae3e06fc21146eb280 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/stmmac/stmmac_main.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/net/wireless/wl12xx/wl1271_spi.c
net/core/ethtool.c
net/mac80211/scan.c
Diffstat (limited to 'Documentation/watchdog/watchdog-api.txt')
| -rw-r--r-- | Documentation/watchdog/watchdog-api.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/watchdog/watchdog-api.txt b/Documentation/watchdog/watchdog-api.txt index 4cc4ba9d7150..eb7132ed8bbc 100644 --- a/Documentation/watchdog/watchdog-api.txt +++ b/Documentation/watchdog/watchdog-api.txt | |||
| @@ -222,11 +222,10 @@ returned value is the temperature in degrees fahrenheit. | |||
| 222 | ioctl(fd, WDIOC_GETTEMP, &temperature); | 222 | ioctl(fd, WDIOC_GETTEMP, &temperature); |
| 223 | 223 | ||
| 224 | Finally the SETOPTIONS ioctl can be used to control some aspects of | 224 | Finally the SETOPTIONS ioctl can be used to control some aspects of |
| 225 | the cards operation; right now the pcwd driver is the only one | 225 | the cards operation. |
| 226 | supporting this ioctl. | ||
| 227 | 226 | ||
| 228 | int options = 0; | 227 | int options = 0; |
| 229 | ioctl(fd, WDIOC_SETOPTIONS, options); | 228 | ioctl(fd, WDIOC_SETOPTIONS, &options); |
| 230 | 229 | ||
| 231 | The following options are available: | 230 | The following options are available: |
| 232 | 231 | ||