diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dmascc.h | 43 | ||||
| -rw-r--r-- | include/linux/major.h | 2 | ||||
| -rw-r--r-- | include/linux/tty.h | 4 |
3 files changed, 3 insertions, 46 deletions
diff --git a/include/linux/dmascc.h b/include/linux/dmascc.h index a30d84e60..01b46df73 100644 --- a/include/linux/dmascc.h +++ b/include/linux/dmascc.h @@ -41,46 +41,3 @@ struct scc_param { int dma; /* 1, 3 */ }; -/* - * $Id: dmascc.h,v 1.1 1997/12/01 10:44:55 oe1kib Exp $ - * - * Driver for high-speed SCC boards (those with DMA support) - * Copyright (C) 1997 Klaus Kudielka - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -/* Ioctls */ -#define SIOCGSCCPARAM SIOCDEVPRIVATE -#define SIOCSSCCPARAM (SIOCDEVPRIVATE+1) - -/* Frequency of timer 0 */ -#define TMR_0_HZ 25600 - -/* Configurable parameters */ -struct scc_param { - int pclk_hz; /* frequency of BRG input (read-only - don't change) */ - int brg_tc; /* baud rate generator terminal count - BRG disabled if < 0 */ - int nrzi; /* 0 (nrz), 1 (nrzi) */ - int clocks; /* see documentation */ - int txdelay; /* [1/TMR_0_HZ] */ - int txtime; /* [1/HZ] */ - int sqdelay; /* [1/TMR_0_HZ] */ - int waittime; /* [1/TMR_0_HZ] */ - int slottime; /* [1/TMR_0_HZ] */ - int persist; /* 0 ... 255 */ - int dma; /* 1, 3 */ -}; - diff --git a/include/linux/major.h b/include/linux/major.h index 5fa870474..6dee4de76 100644 --- a/include/linux/major.h +++ b/include/linux/major.h @@ -58,7 +58,7 @@ #define ACSI_MAJOR 28 #define AZTECH_CDROM_MAJOR 29 #define GRAPHDEV_MAJOR 29 /* SparcLinux & Linux/68k /dev/fb */ -#define SHMIQ_MAJOR 85 /* Linux/mips, SGI /dev/shmiq */ +#define SHMIQ_MAJOR 85 /* Linux/mips, SGI /dev/shmiq */ #define USEMA_MAJOR 86 /* Linux/MIPS, SGI /dev/usema */ #define CM206_CDROM_MAJOR 32 #define IDE2_MAJOR 33 diff --git a/include/linux/tty.h b/include/linux/tty.h index a00d759f9..9c5d58ca8 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -78,11 +78,11 @@ extern struct screen_info screen_info; #define VIDEO_TYPE_TGAC 0x40 /* DEC TGA */ #define VIDEO_TYPE_SUN 0x50 /* Sun frame buffer. */ -#define VIDEO_TYPE_SUNPCI 0x51 /* Sun PCI based frame buffer. */ +#define VIDEO_TYPE_SUNPCI 0x51 /* Sun PCI based frame buffer. */ #define VIDEO_TYPE_PMAC 0x60 /* PowerMacintosh frame buffer. */ -#define VIDEO_TYPE_SGI 0x70 /* Various SGI graphics hardware */ +#define VIDEO_TYPE_SGI 0x70 /* Various SGI graphics hardware */ /* * This character is the same as _POSIX_VDISABLE: it cannot be used as |