Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[pandora-kernel.git] / include / linux / pnp.h

diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index cd6332b..2f3bcf7 100644 (file)
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -6,15 +6,13 @@
 #ifndef _LINUX_PNP_H
 #define _LINUX_PNP_H
 
-#ifdef __KERNEL__
-
 #include <linux/device.h>
 #include <linux/list.h>
 #include <linux/errno.h>
 #include <linux/mod_devicetable.h>
 
 #define PNP_MAX_PORT           40
-#define PNP_MAX_MEM            12
+#define PNP_MAX_MEM            24
 #define PNP_MAX_IRQ            2
 #define PNP_MAX_DMA            2
 #define PNP_NAME_LEN           50
@@ -175,7 +173,7 @@ static inline void pnp_set_card_drvdata(struct pnp_card_link *pcard, void *data)
 struct pnp_dev {
        struct device dev;              /* Driver Model device interface */
        u64 dma_mask;
-       unsigned char number;           /* used as an index, must be unique */
+       unsigned int number;            /* used as an index, must be unique */
        int status;
 
        struct list_head global_list;   /* node in global list of devices */
@@ -466,6 +464,4 @@ static inline void pnp_unregister_driver(struct pnp_driver *drv) { }
 #define pnp_dbg(format, arg...) do {} while (0)
 #endif
 
-#endif /* __KERNEL__ */
-
 #endif /* _LINUX_PNP_H */