RTC/watchdog: M41T80: fix a potential use of unitialized data

[linux-2.6-omap-h63xx.git] / drivers / serial / m32r_sio.h

diff --git a/drivers/serial/m32r_sio.h b/drivers/serial/m32r_sio.h
index 07d0dd80aa3dd2197861abddd1f27633aa7b7c2a..e9b7e11793b183c531fe927c609e4e4b18062630 100644 (file)
--- a/drivers/serial/m32r_sio.h
+++ b/drivers/serial/m32r_sio.h
@@ -15,7 +15,6 @@
  * (at your option) any later version.
  */
 
-#include <linux/config.h>
 
 struct m32r_sio_probe {
        struct module   *owner;
@@ -37,7 +36,7 @@ struct old_serial_port {
        unsigned int irq;
        unsigned int flags;
        unsigned char io_type;
-       unsigned char *iomem_base;
+       unsigned char __iomem *iomem_base;
        unsigned short iomem_reg_shift;
 };
 
@@ -47,9 +46,3 @@ struct old_serial_port {
 #define PROBE_ANY      (~0)
 
 #define HIGH_BITS_OFFSET ((sizeof(long)-sizeof(int))*8)
-
-#ifdef CONFIG_SERIAL_SIO_SHARE_IRQ
-#define M32R_SIO_SHARE_IRQS 1
-#else
-#define M32R_SIO_SHARE_IRQS 0
-#endif