Re: Linux 2.4.21-pre3: some compile fixes I needed

Eyal Lebedinsky
2003-01-07T10:41:49Z

[-- Attachment #1: Type: text/plain, Size: 493 bytes --]

linux/drivers/char/Makefile
===========================
Well, here the build fails with a suggestion that I fix the
Makefile. This trivial change allows the build to continue.

drivers/ieee1394/sbp2.c
=======================
It stil fails as before. The attached fix is a blind hack to
get it to compile rather than an educated fix.

linux/drivers/usb/hcd/ehci-hcd.c
================================
A problem for older gcc.

--
Eyal Lebedinsky (eyal@eyal.emu.id.au) <http://samba.org/eyal/>

[-- Attachment #2: 2.4.21-pre3-char.patch --]
[-- Type: text/plain, Size: 438 bytes --]

--- linux/drivers/char/Makefile.orig Tue Jan 7 20:13:30 2003
+++ linux/drivers/char/Makefile Tue Jan 7 20:17:16 2003
@@ -24,7 +24,7 @@
export-objs := busmouse.o console.o keyboard.o sysrq.o \
misc.o pty.o random.o selection.o serial.o \
sonypi.o tty_io.o tty_ioctl.o generic_serial.o \
- au1000_gpio.o hp_psaux.o nvram.o
+ au1000_gpio.o hp_psaux.o nvram.o scx200.o

mod-subdirs := joystick ftape drm drm-4.0 pcmcia

[-- Attachment #3: 2.4.21-pre3-sbp2.patch --]
[-- Type: text/plain, Size: 830 bytes --]

--- linux/drivers/ieee1394/sbp2.c.orig Thu Dec 19 10:22:33 2002
+++ linux/drivers/ieee1394/sbp2.c Thu Dec 19 10:23:17 2002
@@ -1511,7 +1511,7 @@
* physical dma in hardware). Mostly just here for debugging...
*/
static int sbp2_handle_physdma_write(struct hpsb_host *host, int nodeid, int destid, quadlet_t *data,
- u64 addr, unsigned int length)
+ u64 addr, unsigned int length, u16 flags)
{

/*
@@ -1527,7 +1527,7 @@
* physical dma in hardware). Mostly just here for debugging...
*/
static int sbp2_handle_physdma_read(struct hpsb_host *host, int nodeid, quadlet_t *data,
- u64 addr, unsigned int length)
+ u64 addr, unsigned int length, u16 flags)
{

/*

[-- Attachment #4: 2.4.21-pre3-ehci-dbg.patch --]
[-- Type: text/plain, Size: 703 bytes --]

--- linux/drivers/usb/hcd/ehci-dbg.c.orig Tue Jan 7 20:55:20 2003
+++ linux/drivers/usb/hcd/ehci-dbg.c Tue Jan 7 21:00:05 2003
@@ -39,6 +39,7 @@
#define ehci_dbg(ehci, fmt, args...) do { } while (0)
#endif

+#if 0
#define ehci_err(ehci, fmt, args...) \
printk(KERN_ERR "%s %s: " fmt, hcd_name, \
(ehci)->hcd.pdev->slot_name, ## args )
@@ -48,6 +49,14 @@
#define ehci_warn(ehci, fmt, args...) \
printk(KERN_WARNING "%s %s: " fmt, hcd_name, \
(ehci)->hcd.pdev->slot_name, ## args )
+#else
+#define ehci_err(ehci, fmt, args...) \
+ do { } while (0)
+#define ehci_info(ehci, fmt, args...) \
+ do { } while (0)
+#define ehci_warn(ehci, fmt, args...) \
+ do { } while (0)
+#endif
#endif