drivers/usb/pegasus.h and drivers/usb/CDCEther.h defines private
ALIGN-macros which collides with the macro in
include/linux/cache.h. This patch renames the private macros to
avoid this.
--
//anders/g
--- linux-2.5.7-pre1/drivers/usb/CDCEther.h Thu Feb 21 09:57:46 2002
+++ linux-2.5.7-pre1-reiser/drivers/usb/CDCEther.h Sat Mar 16 01:54:34 2002
@@ -43,7 +43,7 @@
#define CDC_ETHER_REQ_GET_REGS 0xf0
#define CDC_ETHER_REQ_SET_REGS 0xf1
#define CDC_ETHER_REQ_SET_REG PIPERIDER_REQ_SET_REGS
-#define ALIGN(x) x __attribute__((aligned(L1_CACHE_BYTES)))
+#define CDC_ETHER_ALIGN(x) x
+__attribute__((aligned(L1_CACHE_BYTES)))
#define MODE_FLAG_PROMISCUOUS (1<<0)
#define MODE_FLAG_ALL_MULTICAST (1<<1)
@@ -84,9 +84,9 @@
__u8 bNumberPowerFilters;
int intr_interval;
struct urb *rx_urb, *tx_urb, *intr_urb;
- unsigned char ALIGN(rx_buff[CDC_ETHER_MAX_MTU]);
- unsigned char ALIGN(tx_buff[CDC_ETHER_MAX_MTU]);
- unsigned char ALIGN(intr_buff[8]);
+ unsigned char CDC_ETHER_ALIGN(rx_buff[CDC_ETHER_MAX_MTU]);
+ unsigned char CDC_ETHER_ALIGN(tx_buff[CDC_ETHER_MAX_MTU]);
+ unsigned char CDC_ETHER_ALIGN(intr_buff[8]);
} ether_dev_t;
#define REQ_HDR_FUNC_DESCR 0x0001
--- linux-2.5.7-pre1/drivers/usb/pegasus.h Fri Mar 8 19:31:50 2002
+++ linux-2.5.7-pre1-reiser/drivers/usb/pegasus.h Sat Mar 16 01:53:34 2002
@@ -66,7 +66,7 @@
#define PEGASUS_REQ_GET_REGS 0xf0
#define PEGASUS_REQ_SET_REGS 0xf1
#define PEGASUS_REQ_SET_REG PEGASUS_REQ_SET_REGS
-#define ALIGN(x) x __attribute__((aligned(L1_CACHE_BYTES)))
+#define PEGASUS_ALIGN(x) x
+__attribute__((aligned(L1_CACHE_BYTES)))
enum pegasus_registers {
EthCtrl0 = 0,
@@ -103,9 +103,9 @@
struct usb_ctrlrequest dr;
wait_queue_head_t ctrl_wait;
struct semaphore ctrl_sem;
- unsigned char ALIGN(rx_buff[PEGASUS_MAX_MTU]);
- unsigned char ALIGN(tx_buff[PEGASUS_MAX_MTU]);
- unsigned char ALIGN(intr_buff[8]);
+ unsigned char PEGASUS_ALIGN(rx_buff[PEGASUS_MAX_MTU]);
+ unsigned char PEGASUS_ALIGN(tx_buff[PEGASUS_MAX_MTU]);
+ unsigned char PEGASUS_ALIGN(intr_buff[8]);
__u8 eth_regs[4];
__u8 phy;
__u8 gpio_res;
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
