diff options
| author | Thomas Koeller <thomas.koeller@baslerweb.com> | 2006-12-05 19:45:26 -0500 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2006-12-07 16:38:09 -0500 |
| commit | bec4f749cb75d30cebf9837985a06474f595f3ae (patch) | |
| tree | 8a7ce48ecc43c987599e894a7475882ba6a16cc4 | |
| parent | 68380b581383c028830f79ec2670f4a193854aa6 (diff) | |
[WATCHDOG] rm9k_wdt: fix compilation
Driver did not compile any more. Someone moved the definition
of 'struct miscdevice miscdev' to a place near the end of the
file, after some code that was refering to this variable.
Signed-off-by: Thomas Koeller <thomas.koeller@baslerweb.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| -rw-r--r-- | drivers/char/watchdog/rm9k_wdt.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/char/watchdog/rm9k_wdt.c b/drivers/char/watchdog/rm9k_wdt.c index ec3909371c21..bc7def48e0e6 100644 --- a/drivers/char/watchdog/rm9k_wdt.c +++ b/drivers/char/watchdog/rm9k_wdt.c | |||
| @@ -94,6 +94,26 @@ module_param(nowayout, bool, 0444); | |||
| 94 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be disabled once started"); | 94 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be disabled once started"); |
| 95 | 95 | ||
| 96 | 96 | ||
| 97 | /* Kernel interfaces */ | ||
| 98 | static struct file_operations fops = { | ||
| 99 | .owner = THIS_MODULE, | ||
| 100 | .open = wdt_gpi_open, | ||
| 101 | .release = wdt_gpi_release, | ||
| 102 | .write = wdt_gpi_write, | ||
| 103 | .unlocked_ioctl = wdt_gpi_ioctl, | ||
| 104 | }; | ||
| 105 | |||
| 106 | static struct miscdevice miscdev = { | ||
| 107 | .minor = WATCHDOG_MINOR, | ||
| 108 | .name = wdt_gpi_name, | ||
| 109 | .fops = &fops, | ||
| 110 | }; | ||
| 111 | |||
| 112 | static struct notifier_block wdt_gpi_shutdown = { | ||
| 113 | .notifier_call = wdt_gpi_notify, | ||
| 114 | }; | ||
| 115 | |||
| 116 | |||
| 97 | /* Interrupt handler */ | 117 | /* Interrupt handler */ |
| 98 | static irqreturn_t wdt_gpi_irqhdl(int irq, void *ctxt, struct pt_regs *regs) | 118 | static irqreturn_t wdt_gpi_irqhdl(int irq, void *ctxt, struct pt_regs *regs) |
| 99 | { | 119 | { |
| @@ -312,26 +332,6 @@ wdt_gpi_notify(struct notifier_block *this, unsigned long code, void *unused) | |||
| 312 | } | 332 | } |
| 313 | 333 | ||
| 314 | 334 | ||
| 315 | /* Kernel interfaces */ | ||
| 316 | static struct file_operations fops = { | ||
| 317 | .owner = THIS_MODULE, | ||
| 318 | .open = wdt_gpi_open, | ||
| 319 | .release = wdt_gpi_release, | ||
| 320 | .write = wdt_gpi_write, | ||
| 321 | .unlocked_ioctl = wdt_gpi_ioctl, | ||
| 322 | }; | ||
| 323 | |||
| 324 | static struct miscdevice miscdev = { | ||
| 325 | .minor = WATCHDOG_MINOR, | ||
| 326 | .name = wdt_gpi_name, | ||
| 327 | .fops = &fops, | ||
| 328 | }; | ||
| 329 | |||
| 330 | static struct notifier_block wdt_gpi_shutdown = { | ||
| 331 | .notifier_call = wdt_gpi_notify, | ||
| 332 | }; | ||
| 333 | |||
| 334 | |||
| 335 | /* Init & exit procedures */ | 335 | /* Init & exit procedures */ |
| 336 | static const struct resource * | 336 | static const struct resource * |
| 337 | wdt_gpi_get_resource(struct platform_device *pdv, const char *name, | 337 | wdt_gpi_get_resource(struct platform_device *pdv, const char *name, |
