Merge http://linux-isdn.bkbits.net/linux-2.5.make

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

drivers/block/paride/Makefile

@@ -7,7 +7,7 @@
 
 L_TARGET := paride.a
 
-export-objs := bpck6.o
+export-objs := paride.o bpck6.o
 
 obj-$(CONFIG_PARIDE)		+= paride.o
 obj-$(CONFIG_PARIDE_PD)		+= pd.o

drivers/block/paride/paride.c

@@ -51,21 +51,29 @@ void pi_write_regr( PIA *pi, int cont, int regr, int val)
 {	pi->proto->write_regr(pi,cont,regr,val);
 }
 
+EXPORT_SYMBOL(pi_write_regr);
+
 int pi_read_regr( PIA *pi, int cont, int regr)
 
 {	return pi->proto->read_regr(pi,cont,regr);
 }
 
+EXPORT_SYMBOL(pi_read_regr);
+
 void pi_write_block( PIA *pi, char * buf, int count)
 
 {	pi->proto->write_block(pi,buf,count);
 }
 
+EXPORT_SYMBOL(pi_write_block);
+
 void pi_read_block( PIA *pi, char * buf, int count)
 
 {       pi->proto->read_block(pi,buf,count);
 }
 
+EXPORT_SYMBOL(pi_read_block);
+
 #ifdef CONFIG_PARPORT
 
 static void pi_wake_up( void *p)
@@ -116,6 +124,8 @@ void pi_do_claimed( PIA *pi, void(*cont)(void))
 
 #endif
 
+EXPORT_SYMBOL(pi_do_claimed);
+
 static void pi_claim( PIA *pi)
 
 {	if (pi->claimed) return;
@@ -141,12 +151,16 @@ void pi_connect( PIA *pi)
 	pi->proto->connect(pi);
 }
 
+EXPORT_SYMBOL(pi_connect);
+
 void pi_disconnect( PIA *pi)
 
 {	pi->proto->disconnect(pi);
 	pi_unclaim(pi);
 }
 
+EXPORT_SYMBOL(pi_disconnect);
+
 static void pi_unregister_parport( PIA *pi)
 
 {
@@ -168,6 +182,8 @@ void pi_release( PIA *pi)
 	pi->proto->release_proto(pi);
 }
 
+EXPORT_SYMBOL(pi_release);
+
 #define WR(r,v)         pi_write_regr(pi,0,r,v)
 #define RR(r)           (pi_read_regr(pi,0,r))
 
@@ -226,6 +242,8 @@ int  pi_register( PIP *pr)
 	return 1;
 }	
 
+EXPORT_SYMBOL(pi_register);
+
 void pi_unregister( PIP *pr)
 
 {	if (!pr) return;
@@ -237,6 +255,8 @@ void pi_unregister( PIP *pr)
 	MOD_DEC_USE_COUNT;
 }
 
+EXPORT_SYMBOL(pi_unregister);
+
 static int pi_register_parport( PIA *pi, int verbose)
 
 {
@@ -416,6 +436,8 @@ int pi_init(PIA *pi, int autoprobe, int port, int mode,
 	return 1;
 }
 
+EXPORT_SYMBOL(pi_init);
+
 #ifdef MODULE
 
 int	init_module(void)

drivers/char/Makefile

@@ -16,7 +16,8 @@ obj-y	 += mem.o tty_io.o n_tty.o tty_ioctl.o raw.o pty.o misc.o random.o
 
 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 rtc.o
+			sonypi.o tty_io.o tty_ioctl.o generic_serial.o rtc.o \
+			ip2main.o
 
 mod-subdirs	:=	ftape drm pcmcia
 

drivers/char/ip2main.c

@@ -579,7 +579,7 @@ cleanup_module(void)
 /* SA_RANDOM   - can be source for cert. random number generators */
 #define IP2_SA_FLAGS	0
 
-int __init
+int
 ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize) 
 {
 #ifdef	CONFIG_DEVFS_FS
@@ -974,6 +974,8 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)
 	return 0;
 }
 
+EXPORT_SYMBOL(ip2_loadmain);
+
 /******************************************************************************/
 /* Function:   ip2_init_board()                                               */
 /* Parameters: Index of board in configuration structure                      */

drivers/net/wan/Makefile

@@ -7,7 +7,8 @@
 
 O_TARGET := wan.o
 
-export-objs :=	z85230.o syncppp.o comx.o sdladrv.o cycx_drv.o hdlc_generic.o
+export-objs :=	z85230.o syncppp.o comx.o sdladrv.o cycx_drv.o hdlc_generic.o \
+		dlci.o
 
 wanpipe-y			:= sdlamain.o sdla_ft1.o
 wanpipe-$(CONFIG_WANPIPE_X25)	+= sdla_x25.o

drivers/net/wan/dlci.c

@@ -96,6 +96,8 @@ int register_frad(const char *name)
 	return(0);
 }
 
+EXPORT_SYMBOL(register_frad);
+
 int unregister_frad(const char *name)
 {
 	int i;

drivers/video/Makefile

@@ -15,7 +15,7 @@ export-objs    := fbmem.o fbcmap.o fbcon.o fbmon.o modedb.o \
 		  fbcon-iplan2p8.o fbcon-vga-planes.o fbcon-cfb16.o \
 		  fbcon-cfb2.o fbcon-cfb24.o fbcon-cfb32.o fbcon-cfb4.o \
 		  fbcon-cfb8.o fbcon-mac.o fbcon-mfb.o \
-		  cyber2000fb.o sa1100fb.o fbcon-hga.o
+		  cyber2000fb.o sa1100fb.o fbcon-hga.o fbgen.o
 
 # Each configuration option enables a list of files.