← Back to branch summary

~ubuntu-branches/debian/experimental/linux-2.6/experimental

« back to all changes in this revision

Viewing changes to drivers/watchdog/sa1100_wdt.c

  • Committer: Package Import Robot
  • Author(s): maximilian attems, maximilian attems, Ben Hutchings
  • Date: 2012-06-06 10:25:57 UTC
  • mfrom: (1.2.38)
  • Revision ID: package-import@ubuntu.com-20120606102557-b9j3506wcwrqrnx8
Tags: 3.4.1-1~experimental.1
* New upstream release: http://kernelnewbies.org/Linux_3.4
* New upstream stable update:
  http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.4.1

[ maximilian attems ]
* Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT,
  IP_NF_MATCH_RPFILTER, IP6_NF_MATCH_RPFILTER, NETFILTER_NETLINK_ACCT,
  NETFILTER_XT_MATCH_NFACCT, NET_SCH_PLUG, SCSI_UFSHCD, SCSI_VIRTIO,
  NET_TEAM, ATH6KL.

[ Ben Hutchings ]
* DFSG: Remove the new vs6624 driver, which contains non-free firmware
* aufs: Update to aufs3.4-20120521
* [rt] Update to 3.4-rt8 and reenable

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/watchdog/sa1100_wdt.c
17
17
 *
18
18
 *      27/11/2000 Initial release
19
19
 */
 
20
 
 
21
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
22
 
20
23
#include <linux/module.h>
21
24
#include <linux/moduleparam.h>
22
25
#include <linux/types.h>
25
28
#include <linux/miscdevice.h>
26
29
#include <linux/watchdog.h>
27
30
#include <linux/init.h>
 
31
#include <linux/io.h>
28
32
#include <linux/bitops.h>
29
33
#include <linux/uaccess.h>
30
34
#include <linux/timex.h>
66
70
 */
67
71
static int sa1100dog_release(struct inode *inode, struct file *file)
68
72
{
69
 
        printk(KERN_CRIT "WATCHDOG: Device closed - timer will not stop\n");
 
73
        pr_crit("Device closed - timer will not stop\n");
70
74
        clear_bit(1, &sa1100wdt_users);
71
75
        return 0;
72
76
}
169
173
 
170
174
        ret = misc_register(&sa1100dog_miscdev);
171
175
        if (ret == 0)
172
 
                printk(KERN_INFO
173
 
                        "SA1100/PXA2xx Watchdog Timer: timer margin %d sec\n",
174
 
                                                margin);
 
176
                pr_info("SA1100/PXA2xx Watchdog Timer: timer margin %d sec\n",
 
177
                        margin);
175
178
        return ret;
176
179
}
177
180