Re-enable UML build. At least the kernel compiles. Need to verify that it actually...

[linux-2.6.git] / drivers / net / irda / vlsi_ir.h

diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h
index 414694a..c37f0bc 100644 (file)
--- a/drivers/net/irda/vlsi_ir.h
+++ b/drivers/net/irda/vlsi_ir.h
@@ -58,7 +58,7 @@ typedef void irqreturn_t;
 
 /* PDE() introduced in 2.5.4 */
 #ifdef CONFIG_PROC_FS
-#define PDE(inode) ((inode)->u.generic_ip)
+#define PDE(inode) ((inode)->i_private)
 #endif
 
 /* irda crc16 calculation exported in 2.5.42 */
@@ -69,14 +69,8 @@ typedef void irqreturn_t;
 
 #else /* 2.5 or later */
 
-/* recent 2.5/2.6 stores pci device names at varying places ;-) */
-#ifdef CONFIG_PCI_NAMES
-/* human readable name */
-#define PCIDEV_NAME(pdev)      ((pdev)->pretty_name)
-#else
 /* whatever we get from the associated struct device - bus:slot:dev.fn id */
 #define PCIDEV_NAME(pdev)      (pci_name(pdev))
-#endif
 
 #endif
 
@@ -583,8 +577,8 @@ struct ring_descr_hw {
                struct {
                        u8              addr_res[3];
                        volatile u8     status;         /* descriptor status */
-               } rd_s __attribute__((packed));
-       } rd_u __attribute((packed));
+               } __attribute__((packed)) rd_s;
+       } __attribute((packed)) rd_u;
 } __attribute__ ((packed));
 
 #define rd_addr                rd_u.addr