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

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

Rules.make

@@ -19,7 +19,6 @@ unexport SUB_DIRS
 unexport ALL_SUB_DIRS
 unexport MOD_SUB_DIRS
 unexport O_TARGET
-unexport ALL_MOBJS
 
 unexport obj-y
 unexport obj-m
@@ -33,6 +32,12 @@ unexport subdir-
 
 comma	:= ,
 
+#
+# When an object is listed to be built compiled-in and modular,
+# only build the compiled-in version
+#
+obj-m := $(filter-out $(obj-y),$(obj-m))
+
 #
 # Get things started.
 #
@@ -182,8 +187,7 @@ endif
 #
 # A rule to make modules
 #
-ALL_MOBJS = $(filter-out $(obj-y), $(obj-m))
-ifneq "$(strip $(ALL_MOBJS))" ""
+ifneq "$(strip $(obj-m))" ""
 MOD_DESTDIR := $(shell $(CONFIG_SHELL) $(TOPDIR)/scripts/pathdown.sh)
 endif
 
@@ -200,14 +204,14 @@ $(patsubst %,_modinst_%,$(MOD_DIRS)) : dummy
 endif
 
 .PHONY: modules
-modules: $(ALL_MOBJS) dummy \
+modules: $(obj-m) dummy \
 	 $(patsubst %,_modsubdir_%,$(MOD_DIRS))
 
 .PHONY: _modinst__
 _modinst__: dummy
-ifneq "$(strip $(ALL_MOBJS))" ""
+ifneq "$(strip $(obj-m))" ""
 	mkdir -p $(MODLIB)/kernel/$(MOD_DESTDIR)
-	cp $(ALL_MOBJS) $(MODLIB)/kernel/$(MOD_DESTDIR)
+	cp $(obj-m) $(MODLIB)/kernel/$(MOD_DESTDIR)
 endif
 
 .PHONY: modules_install

net/irda/ircomm/Makefile

@@ -4,6 +4,8 @@
 
 O_TARGET := ircomm_and_tty.o
 
+export-objs := ircomm_core.o
+
 ircomm-objs := ircomm_core.o ircomm_event.o ircomm_lmp.o ircomm_ttp.o
 ircomm-tty-objs := ircomm_tty.o ircomm_tty_attach.o ircomm_tty_ioctl.o ircomm_param.o
 

net/irda/ircomm/ircomm_core.c

@@ -134,6 +134,8 @@ struct ircomm_cb *ircomm_open(notify_t *notify, __u8 service_type, int line)
 	return self;
 }
 
+EXPORT_SYMBOL(ircomm_open);
+
 /*
  * Function ircomm_close_instance (self)
  *
@@ -187,6 +189,8 @@ int ircomm_close(struct ircomm_cb *self)
         return __ircomm_close(self);
 }
 
+EXPORT_SYMBOL(ircomm_close);
+
 /*
  * Function ircomm_connect_request (self, service_type)
  *
@@ -217,6 +221,8 @@ int ircomm_connect_request(struct ircomm_cb *self, __u8 dlsap_sel,
 	return ret;
 }
 
+EXPORT_SYMBOL(ircomm_connect_request);
+
 /*
  * Function ircomm_connect_indication (self, qos, skb)
  *
@@ -269,6 +275,8 @@ int ircomm_connect_response(struct ircomm_cb *self, struct sk_buff *userdata)
 	return ret;
 }	
 
+EXPORT_SYMBOL(ircomm_connect_response);
+
 /*
  * Function connect_confirm (self, skb)
  *
@@ -312,6 +320,8 @@ int ircomm_data_request(struct ircomm_cb *self, struct sk_buff *skb)
 	return ret;
 }
 
+EXPORT_SYMBOL(ircomm_data_request);
+
 /*
  * Function ircomm_data_indication (self, skb)
  *
@@ -387,6 +397,8 @@ int ircomm_control_request(struct ircomm_cb *self, struct sk_buff *skb)
 	return ret;
 }
 
+EXPORT_SYMBOL(ircomm_control_request);
+
 /*
  * Function ircomm_control_indication (self, skb)
  *
@@ -438,6 +450,8 @@ int ircomm_disconnect_request(struct ircomm_cb *self, struct sk_buff *userdata)
 	return ret;
 }
 
+EXPORT_SYMBOL(ircomm_disconnect_request);
+
 /*
  * Function disconnect_indication (self, skb)
  *
@@ -479,6 +493,8 @@ void ircomm_flow_request(struct ircomm_cb *self, LOCAL_FLOW flow)
 	irttp_flow_request(self->tsap, flow);
 }
 
+EXPORT_SYMBOL(ircomm_flow_request);
+
 #ifdef CONFIG_PROC_FS
 /*
  * Function ircomm_proc_read (buf, start, offset, len, unused)
@@ -542,4 +558,3 @@ void cleanup_module(void)
 	ircomm_cleanup();
 }
 #endif /* MODULE */
-