merges from KERNEL_2_4
This commit is contained in:
parent
5ad604bf7f
commit
132d6d83b7
|
@ -70,12 +70,7 @@ HFC-USB ISDN TAs
|
|||
|
||||
Note: PCF, PCF-Pro: up to now, only the ISDN part is supported
|
||||
PCC-8: not tested yet
|
||||
Teles PCMCIA is EXPERIMENTAL
|
||||
Teles 16.3c is EXPERIMENTAL
|
||||
Teles PCI is EXPERIMENTAL
|
||||
Teles S0Box is EXPERIMENTAL
|
||||
Eicon.Diehl Diva U interface not tested
|
||||
HFC-S+, HFC-SP/PCMCIA and HFC-USB are experimental
|
||||
|
||||
If you know other passive cards with the Siemens chipset, please let me know.
|
||||
To use the PNP cards you need the isapnptools.
|
||||
|
|
|
@ -775,12 +775,6 @@ static void capi_signal(__u16 applid, void *param)
|
|||
|
||||
/* -------- file_operations for capidev ----------------------------- */
|
||||
|
||||
static loff_t
|
||||
capi_llseek(struct file *file, loff_t offset, int origin)
|
||||
{
|
||||
return -ESPIPE;
|
||||
}
|
||||
|
||||
static ssize_t
|
||||
capi_read(struct file *file, char *buf, size_t count, loff_t *ppos)
|
||||
{
|
||||
|
@ -1153,7 +1147,7 @@ static struct file_operations capi_fops =
|
|||
#ifdef COMPAT_HAS_FILEOP_OWNER
|
||||
owner: THIS_MODULE,
|
||||
#endif
|
||||
llseek: capi_llseek,
|
||||
llseek: no_llseek,
|
||||
read: capi_read,
|
||||
write: capi_write,
|
||||
poll: capi_poll,
|
||||
|
@ -1190,12 +1184,6 @@ capinc_raw_open(struct inode *inode, struct file *file)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static loff_t
|
||||
capinc_raw_llseek(struct file *file, loff_t offset, int origin)
|
||||
{
|
||||
return -ESPIPE;
|
||||
}
|
||||
|
||||
static ssize_t
|
||||
capinc_raw_read(struct file *file, char *buf, size_t count, loff_t *ppos)
|
||||
{
|
||||
|
@ -1390,7 +1378,7 @@ static struct file_operations capinc_raw_fops =
|
|||
#ifdef COMPAT_HAS_FILEOP_OWNER
|
||||
owner: THIS_MODULE,
|
||||
#endif
|
||||
llseek: capinc_raw_llseek,
|
||||
llseek: no_llseek,
|
||||
read: capinc_raw_read,
|
||||
write: capinc_raw_write,
|
||||
poll: capinc_raw_poll,
|
||||
|
|
|
@ -291,15 +291,9 @@ isdn_divert_ioctl(struct inode *inode, struct file *file,
|
|||
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
static loff_t
|
||||
isdn_divert_lseek(struct file *file, loff_t offset, int orig)
|
||||
{
|
||||
return -ESPIPE;
|
||||
}
|
||||
|
||||
static struct file_operations isdn_fops =
|
||||
{
|
||||
llseek: isdn_divert_lseek,
|
||||
llseek: no_llseek,
|
||||
read: isdn_divert_read,
|
||||
write: isdn_divert_write,
|
||||
poll: isdn_divert_poll,
|
||||
|
|
|
@ -25,8 +25,8 @@
|
|||
<maniemann@users.sourceforge.net>. All Rights Reserved.
|
||||
|
||||
Alternatively, the contents of this file may be used under the
|
||||
terms of the GNU Public License version 2 (the "GPL"), in which
|
||||
case the provisions of the GPL are applicable instead of the
|
||||
terms of the GNU General Public License version 2 (the "GPL"), in
|
||||
which case the provisions of the GPL are applicable instead of the
|
||||
above. If you wish to allow the use of your version of this file
|
||||
only under the terms of the GPL and not to allow others to use
|
||||
your version of this file under the MPL, indicate your decision
|
||||
|
|
|
@ -94,15 +94,6 @@ process_line(struct conf_writedata *cnf)
|
|||
return (0);
|
||||
} /* process_line */
|
||||
|
||||
/*************************/
|
||||
/* dummy file operations */
|
||||
/*************************/
|
||||
static loff_t
|
||||
hysdn_dummy_lseek(struct file *file, loff_t offset, int orig)
|
||||
{
|
||||
return -ESPIPE;
|
||||
} /* hysdn_dummy_lseek */
|
||||
|
||||
/***********************************/
|
||||
/* conf file operations and tables */
|
||||
/***********************************/
|
||||
|
@ -428,7 +419,7 @@ hysdn_conf_close(struct inode *ino, struct file *filep)
|
|||
/******************************************************/
|
||||
static struct file_operations conf_fops =
|
||||
{
|
||||
llseek: hysdn_dummy_lseek,
|
||||
llseek: no_llseek,
|
||||
read: hysdn_conf_read,
|
||||
write: hysdn_conf_write,
|
||||
open: hysdn_conf_open,
|
||||
|
|
|
@ -155,15 +155,6 @@ put_log_buffer(hysdn_card * card, char *cp)
|
|||
} /* put_log_buffer */
|
||||
|
||||
|
||||
/*************************/
|
||||
/* dummy file operations */
|
||||
/*************************/
|
||||
static loff_t
|
||||
hysdn_dummy_lseek(struct file *file, loff_t offset, int orig)
|
||||
{
|
||||
return -ESPIPE;
|
||||
} /* hysdn_dummy_lseek */
|
||||
|
||||
/******************************/
|
||||
/* file operations and tables */
|
||||
/******************************/
|
||||
|
@ -433,7 +424,7 @@ hysdn_log_poll(struct file *file, poll_table * wait)
|
|||
/**************************************************/
|
||||
static struct file_operations log_fops =
|
||||
{
|
||||
llseek: hysdn_dummy_lseek,
|
||||
llseek: no_llseek,
|
||||
read: hysdn_log_read,
|
||||
write: hysdn_log_write,
|
||||
poll: hysdn_log_poll,
|
||||
|
|
|
@ -1243,12 +1243,6 @@ isdn_read(struct file *file, char *buf, size_t count, loff_t * off)
|
|||
return retval;
|
||||
}
|
||||
|
||||
static loff_t
|
||||
isdn_llseek(struct file *file, loff_t offset, int orig)
|
||||
{
|
||||
return -ESPIPE;
|
||||
}
|
||||
|
||||
static ssize_t
|
||||
isdn_write(struct file *file, const char *buf, size_t count, loff_t * off)
|
||||
{
|
||||
|
@ -1903,7 +1897,7 @@ static struct file_operations isdn_fops =
|
|||
#ifdef COMPAT_HAS_FILEOP_OWNER
|
||||
owner: THIS_MODULE,
|
||||
#endif
|
||||
llseek: isdn_llseek,
|
||||
llseek: no_llseek,
|
||||
read: isdn_read,
|
||||
write: isdn_write,
|
||||
poll: isdn_poll,
|
||||
|
|
Loading…
Reference in New Issue