Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58dc125a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

parents c544bdb1 8a4c8a96

drivers/atm/zatm.c

+7 −5
Original line number Diff line number Diff line
@@ -669,11 +669,13 @@ printk("NONONONOO!!!!\n"); 
		u32 *put;

		int i;



		dsc = (u32 *) kmalloc(uPD98401_TXPD_SIZE*2+

		dsc = kmalloc(uPD98401_TXPD_SIZE * 2 +

			uPD98401_TXBD_SIZE * ATM_SKB(skb)->iovcnt, GFP_ATOMIC);

		if (!dsc) {

			if (vcc->pop) vcc->pop(vcc,skb);

			else dev_kfree_skb_irq(skb);

			if (vcc->pop)

				vcc->pop(vcc, skb);

			else

				dev_kfree_skb_irq(skb);

			return -EAGAIN;

		}

		/* @@@ should check alignment */

drivers/net/irda/Kconfig

+1 −2
Original line number Diff line number Diff line 


menu "Infrared-port device drivers"

	depends on IRDA!=n
@@ -156,7 +155,7 @@ comment "Old Serial dongle support" 


config DONGLE_OLD

	bool "Old Serial dongle support"

	depends on (IRTTY_OLD || IRPORT_SIR) && BROKEN_ON_SMP

	depends on IRPORT_SIR && BROKEN_ON_SMP

	help

	  Say Y here if you have an infrared device that connects to your

	  computer's serial port. These devices are called dongles. Then say Y

drivers/net/irda/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -45,4 +45,4 @@ obj-$(CONFIG_ACT200L_DONGLE) += act200l-sir.o 
obj-$(CONFIG_MA600_DONGLE)	+= ma600-sir.o



# The SIR helper module

sir-dev-objs := sir_core.o sir_dev.o sir_dongle.o sir_kthread.o
 
sir-dev-objs := sir_dev.o sir_dongle.o sir_kthread.o

drivers/net/irda/sir-dev.h

+0 −2
Original line number Diff line number Diff line
@@ -133,8 +133,6 @@ extern int sirdev_put_dongle(struct sir_dev *self); 


extern void sirdev_enable_rx(struct sir_dev *dev);

extern int sirdev_schedule_request(struct sir_dev *dev, int state, unsigned param);

extern int __init irda_thread_create(void);

extern void __exit irda_thread_join(void);



/* inline helpers */

drivers/net/irda/sir_core.c

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
/*********************************************************************

 *

 *	sir_core.c:	module core for irda-sir abstraction layer

 *

 *	Copyright (c) 2002 Martin Diehl

 * 

 *	This program is free software; you can redistribute it and/or 

 *	modify it under the terms of the GNU General Public License as 

 *	published by the Free Software Foundation; either version 2 of 

 *	the License, or (at your option) any later version.

 *

 ********************************************************************/    



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/init.h>



#include <net/irda/irda.h>



#include "sir-dev.h"



/***************************************************************************/



MODULE_AUTHOR("Martin Diehl <info@mdiehl.de>");

MODULE_DESCRIPTION("IrDA SIR core");

MODULE_LICENSE("GPL");



/***************************************************************************/



EXPORT_SYMBOL(irda_register_dongle);

EXPORT_SYMBOL(irda_unregister_dongle);



EXPORT_SYMBOL(sirdev_get_instance);

EXPORT_SYMBOL(sirdev_put_instance);



EXPORT_SYMBOL(sirdev_set_dongle);

EXPORT_SYMBOL(sirdev_write_complete);

EXPORT_SYMBOL(sirdev_receive);



EXPORT_SYMBOL(sirdev_raw_write);

EXPORT_SYMBOL(sirdev_raw_read);

EXPORT_SYMBOL(sirdev_set_dtr_rts);



static int __init sir_core_init(void)

{

	return irda_thread_create();

}



static void __exit sir_core_exit(void)

{

	irda_thread_join();

}



module_init(sir_core_init);

module_exit(sir_core_exit);