git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[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
55e4a7f
..
a82a4ba
100644
(file)
--- a/
drivers/net/irda/vlsi_ir.h
+++ b/
drivers/net/irda/vlsi_ir.h
@@
-69,14
+69,8
@@
typedef void irqreturn_t;
#else /* 2.5 or later */
#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))
/* whatever we get from the associated struct device - bus:slot:dev.fn id */
#define PCIDEV_NAME(pdev) (pci_name(pdev))
-#endif
#endif
#endif
@@
-583,8
+577,8
@@
struct ring_descr_hw {
struct {
u8 addr_res[3];
volatile u8 status; /* descriptor status */
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
} __attribute__ ((packed));
#define rd_addr rd_u.addr
@@
-656,7
+650,7
@@
static inline void rd_set_addr_status(struct ring_descr *rd, dma_addr_t a, u8 s)
*/
if ((a & ~DMA_MASK_MSTRPAGE)>>24 != MSTRPAGE_VALUE) {
*/
if ((a & ~DMA_MASK_MSTRPAGE)>>24 != MSTRPAGE_VALUE) {
- ERROR("%s: pci busaddr inconsistency!\n", __FUNCTION__);
+
IRDA_
ERROR("%s: pci busaddr inconsistency!\n", __FUNCTION__);
dump_stack();
return;
}
dump_stack();
return;
}
@@
-769,7
+763,6
@@
typedef struct vlsi_irda_dev {
spinlock_t lock;
struct semaphore sem;
spinlock_t lock;
struct semaphore sem;
- u32 cfg_space[64/sizeof(u32)];
u8 resume_ok;
struct proc_dir_entry *proc_entry;
u8 resume_ok;
struct proc_dir_entry *proc_entry;