diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/ip2/i2pack.h | 2 | ||||
-rw-r--r-- | drivers/char/watchdog/pcwd_usb.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/ip2/i2pack.h b/drivers/char/ip2/i2pack.h index e9b87a78622c..00342a677c90 100644 --- a/drivers/char/ip2/i2pack.h +++ b/drivers/char/ip2/i2pack.h | |||
@@ -358,7 +358,7 @@ typedef struct _failStat | |||
358 | #define MB_OUT_STRIPPED 0x40 // Board has read all output from fifo | 358 | #define MB_OUT_STRIPPED 0x40 // Board has read all output from fifo |
359 | #define MB_FATAL_ERROR 0x20 // Board has encountered a fatal error | 359 | #define MB_FATAL_ERROR 0x20 // Board has encountered a fatal error |
360 | 360 | ||
361 | #pragma pack(4) // Reset padding to command-line default | 361 | #pragma pack() // Reset padding to command-line default |
362 | 362 | ||
363 | #endif // I2PACK_H | 363 | #endif // I2PACK_H |
364 | 364 | ||
diff --git a/drivers/char/watchdog/pcwd_usb.c b/drivers/char/watchdog/pcwd_usb.c index 092e9b133750..1533f56baa42 100644 --- a/drivers/char/watchdog/pcwd_usb.c +++ b/drivers/char/watchdog/pcwd_usb.c | |||
@@ -151,7 +151,6 @@ static void usb_pcwd_disconnect (struct usb_interface *interface); | |||
151 | 151 | ||
152 | /* usb specific object needed to register this driver with the usb subsystem */ | 152 | /* usb specific object needed to register this driver with the usb subsystem */ |
153 | static struct usb_driver usb_pcwd_driver = { | 153 | static struct usb_driver usb_pcwd_driver = { |
154 | .owner = THIS_MODULE, | ||
155 | .name = DRIVER_NAME, | 154 | .name = DRIVER_NAME, |
156 | .probe = usb_pcwd_probe, | 155 | .probe = usb_pcwd_probe, |
157 | .disconnect = usb_pcwd_disconnect, | 156 | .disconnect = usb_pcwd_disconnect, |