diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-07 18:05:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-07 18:05:09 -0700 |
| commit | b588e2bbd7b872c9cdf635fe0f04840534e72443 (patch) | |
| tree | 8e298e0f18f305dd12223ffb36c2450cf62318bb /drivers/watchdog/hpwdt.c | |
| parent | 3df302ff56fac91d54e964faed9d293018ac71ca (diff) | |
| parent | 7944d3a5a70ee5c1904ed1e8b1d71ff0af2854d9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (70 commits)
[WATCHDOG] more coding style clean-up's
[WATCHDOG] sbc8360.c - move stop code into a function
[WATCHDOG] Coding style - Indentation - part 2
[WATCHDOG] Coding style - Indentation - part 1
[WATCHDOG] mpc8xxx_wdt: add support for MPC8xx watchdogs
[WATCHDOG] mpc8xxx_wdt: fix build
[WATCHDOG] mpc8xxx_wdt: various renames, mostly s/mpc83xx/mpc8xxx/g
[WATCHDOG] mpc83xx_wdt: rename to mpc8xxx_wdt
[WATCHDOG] mpc83xx_wdt: add support for MPC86xx CPUs
[WATCHDOG] mpc83xx_wdt: convert to the OF platform driver
[WATCHDOG] pcwd: a couple of watchdogs escaped conversion
[WATCHDOG] Clean-up includes
[WATCHDOG] hpwdt.c - fix double includes
[WATCHDOG 57/57] wdt501/pci: Clean up, coding style and switch to unlocked_ioctl
[WATCHDOG 56/57] wdt977: clean up, coding style and switch to unlocked_ioctl
[WATCHDOG 55/57] wdt285: switch to unlocked_ioctl and tidy up oddments of coding style
[WATCHDOG 54/57] wdrtas: clean up, coding style, switch to unlocked_ioctl
[WATCHDOG 53/57] wafer5823wdt: Clean up, coding style, switch to unlocked_ioctl
[WATCHDOG 52/57] w83977f_wdt: clean up, coding style and switch to unlocked_ioctl
[WATCHDOG 51/57] w83877f_wdt: clean up code, coding style, switch to unlocked_ioctl
...
Diffstat (limited to 'drivers/watchdog/hpwdt.c')
| -rw-r--r-- | drivers/watchdog/hpwdt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index ccd6c530782..d039d5f2fd1 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -39,9 +39,7 @@ #include <linux/string.h> #include <linux/bootmem.h> #include <linux/slab.h> -#include <asm/dmi.h> #include <asm/desc.h> -#include <asm/kdebug.h> #define PCI_BIOS32_SD_VALUE 0x5F32335F /* "_32_" */ #define CRU_BIOS_SIGNATURE_VALUE 0x55524324 @@ -407,7 +405,7 @@ static int __devinit detect_cru_service(void) dmi_walk(dmi_find_cru); /* if cru_rom_addr has been set then we found a CRU service */ - return ((cru_rom_addr != NULL)? 0: -ENODEV); + return ((cru_rom_addr != NULL) ? 0: -ENODEV); } /* ------------------------------------------------------------------------- */ @@ -535,7 +533,7 @@ static ssize_t hpwdt_write(struct file *file, const char __user *data, /* scan to see whether or not we got the magic char. */ for (i = 0; i != len; i++) { char c; - if (get_user(c, data+i)) + if (get_user(c, data + i)) return -EFAULT; if (c == 'V') expect_release = 42; |