diff options
Diffstat (limited to 'include')
31 files changed, 61 insertions, 30 deletions
diff --git a/include/asm-alpha/socket.h b/include/asm-alpha/socket.h index 637889c3f33f..b87863c34400 100644 --- a/include/asm-alpha/socket.h +++ b/include/asm-alpha/socket.h @@ -29,6 +29,7 @@ #define SO_SNDLOWAT 0x1011 #define SO_RCVTIMEO 0x1012 #define SO_SNDTIMEO 0x1013 +#define SO_ACCEPTCONN 0x1014 /* linux-specific, might as well be the same as on i386 */ #define SO_NO_CHECK 11 diff --git a/include/asm-alpha/termios.h b/include/asm-alpha/termios.h index 670576b84e8e..3747936467f8 100644 --- a/include/asm-alpha/termios.h +++ b/include/asm-alpha/termios.h @@ -78,7 +78,7 @@ struct termio { #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ #define N_R3964 9 /* Reserved for Simatic R3964 module */ #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ -#define N_IRDA 11 /* Linux IrDa - http://www.cs.uit.no/~dagb/irda/irda.html */ +#define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ #define N_HDLC 13 /* synchronous HDLC */ #define N_SYNC_PPP 14 diff --git a/include/asm-arm/socket.h b/include/asm-arm/socket.h index a421e6dc329f..37ec7b03c677 100644 --- a/include/asm-arm/socket.h +++ b/include/asm-arm/socket.h @@ -43,6 +43,8 @@ #define SO_TIMESTAMP 29 #define SCM_TIMESTAMP SO_TIMESTAMP +#define SO_ACCEPTCONN 30 + /* Nast libc5 fixup - bletch */ #if defined(__KERNEL__) /* Socket types. */ diff --git a/include/asm-arm/termios.h b/include/asm-arm/termios.h index 6d589dd1d2a3..3da727e71b61 100644 --- a/include/asm-arm/termios.h +++ b/include/asm-arm/termios.h @@ -61,7 +61,7 @@ struct termio { #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ #define N_R3964 9 /* Reserved for Simatic R3964 module */ #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ -#define N_IRDA 11 /* Linux IrDa - http://www.cs.uit.no/~dagb/irda/irda.html */ +#define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ #define N_HDLC 13 /* synchronous HDLC */ #define N_SYNC_PPP 14 diff --git a/include/asm-i386/socket.h b/include/asm-i386/socket.h index c44d16bc0d54..18cd5b9fe416 100644 --- a/include/asm-i386/socket.h +++ b/include/asm-i386/socket.h @@ -43,6 +43,8 @@ #define SO_TIMESTAMP 29 #define SCM_TIMESTAMP SO_TIMESTAMP +#define SO_ACCEPTCONN 30 + /* Nasty libc5 fixup - bletch */ #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) /* Socket types. */ diff --git a/include/asm-i386/termios.h b/include/asm-i386/termios.h index 9b337736f0f3..70c1ecefd6f6 100644 --- a/include/asm-i386/termios.h +++ b/include/asm-i386/termios.h @@ -51,7 +51,7 @@ struct termio { #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ #define N_R3964 9 /* Reserved for Simatic R3964 module */ #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ -#define N_IRDA 11 /* Linux IR - http://www.cs.uit.no/~dagb/irda/irda.html */ +#define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ #define N_HDLC 13 /* synchronous HDLC */ #define N_SYNC_PPP 14 /* synchronous PPP */ diff --git a/include/asm-ia64/socket.h b/include/asm-ia64/socket.h index 5d5eb7b8c773..0c75f7961ace 100644 --- a/include/asm-ia64/socket.h +++ b/include/asm-ia64/socket.h @@ -50,6 +50,8 @@ #define SO_TIMESTAMP 29 #define SCM_TIMESTAMP SO_TIMESTAMP +#define SO_ACCEPTCONN 30 + /* Nast libc5 fixup - bletch */ #if defined(__KERNEL__) /* Socket types. */ diff --git a/include/asm-ia64/termios.h b/include/asm-ia64/termios.h index 3252e91107db..e350569cdf39 100644 --- a/include/asm-ia64/termios.h +++ b/include/asm-ia64/termios.h @@ -58,7 +58,7 @@ struct termio { #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ #define N_R3964 9 /* Reserved for Simatic R3964 module */ #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ -#define N_IRDA 11 /* Linux IR - http://www.cs.uit.no/~dagb/irda/irda.html */ +#define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS msgs */ #define N_HDLC 13 /* synchronous HDLC */ #define N_SYNC_PPP 14 /* synchronous PPP */ diff --git a/include/asm-m68k/bitops.h b/include/asm-m68k/bitops.h index 7d91887d73d6..5b40d766ffe3 100644 --- a/include/asm-m68k/bitops.h +++ b/include/asm-m68k/bitops.h @@ -228,7 +228,7 @@ extern __inline__ int ffs(int x) { int cnt; - asm ("bfffo %1{#0:#0}" : "=d" (cnt) : "dm" (x & -x)); + asm ("bfffo %1{#0:#0},%0" : "=d" (cnt) : "dm" (x & -x)); return 32 - cnt; } diff --git a/include/asm-m68k/errno.h b/include/asm-m68k/errno.h index 1ee6485abd22..8d309d38ec70 100644 --- a/include/asm-m68k/errno.h +++ b/include/asm-m68k/errno.h @@ -129,4 +129,6 @@ #define ENOMEDIUM 123 /* No medium found */ #define EMEDIUMTYPE 124 /* Wrong medium type */ +#define EHASHCOLLISION 125 /* Number of hash collisons exceeds maximum generation counter value. */ + #endif /* _M68K_ERRNO_H */ diff --git a/include/asm-m68k/socket.h b/include/asm-m68k/socket.h index fa13cd8ff65f..1d01fc0879cd 100644 --- a/include/asm-m68k/socket.h +++ b/include/asm-m68k/socket.h @@ -43,6 +43,8 @@ #define SO_TIMESTAMP 29 #define SCM_TIMESTAMP SO_TIMESTAMP +#define SO_ACCEPTCONN 30 + /* Nast libc5 fixup - bletch */ #if defined(__KERNEL__) /* Socket types. */ diff --git a/include/asm-m68k/termios.h b/include/asm-m68k/termios.h index 0f127c134580..411018fdb2dd 100644 --- a/include/asm-m68k/termios.h +++ b/include/asm-m68k/termios.h @@ -61,7 +61,7 @@ struct termio { #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ #define N_R3964 9 /* Reserved for Simatic R3964 module */ #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ -#define N_IRDA 11 /* Linux IrDa - http://www.cs.uit.no/~dagb/irda/irda.html */ +#define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ #define N_HDLC 13 /* synchronous HDLC */ #define N_SYNC_PPP 14 diff --git a/include/asm-mips/socket.h b/include/asm-mips/socket.h index a0e63bbbc68c..0c6bb2cac54c 100644 --- a/include/asm-mips/socket.h +++ b/include/asm-mips/socket.h @@ -33,6 +33,7 @@ To add: #define SO_REUSEPORT 0x0200 /* Allow local address and port reuse. */ #define SO_RCVLOWAT 0x1004 /* receive low-water mark */ #define SO_SNDTIMEO 0x1005 /* send timeout */ #define SO_RCVTIMEO 0x1006 /* receive timeout */ +#define SO_ACCEPTCONN 0x1007 /* linux-specific, might as well be the same as on i386 */ #define SO_NO_CHECK 11 diff --git a/include/asm-mips/termios.h b/include/asm-mips/termios.h index 2e0ed639a709..67fac8170ae7 100644 --- a/include/asm-mips/termios.h +++ b/include/asm-mips/termios.h @@ -97,7 +97,7 @@ struct termio { #define N_MASC 8 /* Reserved fo Mobitex module <kaz@cafe.net> */ #define N_R3964 9 /* Reserved for Simatic R3964 module */ #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ -#define N_IRDA 11 /* Linux IrDa - http://www.cs.uit.no/~dagb/irda/irda.html */ +#define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ #define N_HDLC 13 /* synchronous HDLC */ #define N_SYNC_PPP 14 /* synchronous PPP */ diff --git a/include/asm-mips64/socket.h b/include/asm-mips64/socket.h index 8410eb3847ac..826e2332700a 100644 --- a/include/asm-mips64/socket.h +++ b/include/asm-mips64/socket.h @@ -41,6 +41,7 @@ To add: #define SO_REUSEPORT 0x0200 /* Allow local address and port reuse. */ #define SO_RCVLOWAT 0x1004 /* receive low-water mark */ #define SO_SNDTIMEO 0x1005 /* send timeout */ #define SO_RCVTIMEO 0x1006 /* receive timeout */ +#define SO_ACCEPTCONN 0x1007 /* linux-specific, might as well be the same as on i386 */ #define SO_NO_CHECK 11 diff --git a/include/asm-mips64/termios.h b/include/asm-mips64/termios.h index 930a6dcb149b..0d77b944c1cd 100644 --- a/include/asm-mips64/termios.h +++ b/include/asm-mips64/termios.h @@ -97,7 +97,7 @@ struct termio { #define N_MASC 8 /* Reserved fo Mobitex module <kaz@cafe.net> */ #define N_R3964 9 /* Reserved for Simatic R3964 module */ #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ -#define N_IRDA 11 /* Linux IrDa - http://www.cs.uit.no/~dagb/irda/irda.html */ +#define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ #define N_HDLC 13 /* synchronous HDLC */ #define N_SYNC_PPP 14 /* synchronous PPP */ diff --git a/include/asm-parisc/socket.h b/include/asm-parisc/socket.h index 6ce553460e8e..1cce8a139daa 100644 --- a/include/asm-parisc/socket.h +++ b/include/asm-parisc/socket.h @@ -43,6 +43,8 @@ #define SO_ATTACH_FILTER 0x401a #define SO_DETACH_FILTER 0x401b +#define SO_ACCEPTCONN 0x401c + #if defined(__KERNEL__) #define SOCK_STREAM 1 /* stream (connection) socket */ #define SOCK_DGRAM 2 /* datagram (conn.less) socket */ diff --git a/include/asm-parisc/termios.h b/include/asm-parisc/termios.h index 6aa0f8ff7b4c..13131ef6579a 100644 --- a/include/asm-parisc/termios.h +++ b/include/asm-parisc/termios.h @@ -51,7 +51,7 @@ struct termio { #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ #define N_R3964 9 /* Reserved for Simatic R3964 module */ #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ -#define N_IRDA 11 /* Linux IR - http://www.cs.uit.no/~dagb/irda/irda.html */ +#define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ #ifdef __KERNEL__ diff --git a/include/asm-ppc/socket.h b/include/asm-ppc/socket.h index 40b648d47c39..5bcb396c6513 100644 --- a/include/asm-ppc/socket.h +++ b/include/asm-ppc/socket.h @@ -49,6 +49,8 @@ #define SO_TIMESTAMP 29 #define SCM_TIMESTAMP SO_TIMESTAMP +#define SO_ACCEPTCONN 30 + /* Nast libc5 fixup - bletch */ #if defined(__KERNEL__) /* Socket types. */ diff --git a/include/asm-ppc/termios.h b/include/asm-ppc/termios.h index 22f53ce8b2cd..942c6e4b6718 100644 --- a/include/asm-ppc/termios.h +++ b/include/asm-ppc/termios.h @@ -186,7 +186,7 @@ struct termio { #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ #define N_R3964 9 /* Reserved for Simatic R3964 module */ #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ -#define N_IRDA 11 /* Linux IrDa - http://www.cs.uit.no/~dagb/irda/irda.html */ +#define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ #define N_HDLC 13 /* synchronous HDLC */ #define N_SYNC_PPP 14 diff --git a/include/asm-s390/socket.h b/include/asm-s390/socket.h index 0d00c3b54949..7b52cdb8fc3b 100644 --- a/include/asm-s390/socket.h +++ b/include/asm-s390/socket.h @@ -51,6 +51,8 @@ #define SO_TIMESTAMP 29 #define SCM_TIMESTAMP SO_TIMESTAMP +#define SO_ACCEPTCONN 30 + /* Nast libc5 fixup - bletch */ #if defined(__KERNEL__) /* Socket types. */ diff --git a/include/asm-s390/termios.h b/include/asm-s390/termios.h index 86415c0a2229..16cac3f4c468 100644 --- a/include/asm-s390/termios.h +++ b/include/asm-s390/termios.h @@ -60,7 +60,7 @@ struct termio { #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ #define N_R3964 9 /* Reserved for Simatic R3964 module */ #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ -#define N_IRDA 11 /* Linux IR - http://www.cs.uit.no/~dagb/irda/irda.html */ +#define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ #define N_HDLC 13 /* synchronous HDLC */ diff --git a/include/asm-sh/socket.h b/include/asm-sh/socket.h index 6bba7306e16d..b06e82455cc2 100644 --- a/include/asm-sh/socket.h +++ b/include/asm-sh/socket.h @@ -43,6 +43,8 @@ #define SO_TIMESTAMP 29 #define SCM_TIMESTAMP SO_TIMESTAMP +#define SO_ACCEPTCONN 30 + /* Nast libc5 fixup - bletch */ #if defined(__KERNEL__) /* Socket types. */ diff --git a/include/asm-sh/termios.h b/include/asm-sh/termios.h index 106e675d95a0..f36d7ea3a47f 100644 --- a/include/asm-sh/termios.h +++ b/include/asm-sh/termios.h @@ -51,7 +51,7 @@ struct termio { #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ #define N_R3964 9 /* Reserved for Simatic R3964 module */ #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ -#define N_IRDA 11 /* Linux IR - http://www.cs.uit.no/~dagb/irda/irda.html */ +#define N_IRDA 11 /* Linux IR - http://irda.sourceforge.net/ */ #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ #define N_HDLC 13 /* synchronous HDLC */ #define N_SYNC_PPP 14 diff --git a/include/asm-sparc/socket.h b/include/asm-sparc/socket.h index 256f5c165be1..330e18db30e5 100644 --- a/include/asm-sparc/socket.h +++ b/include/asm-sparc/socket.h @@ -1,4 +1,4 @@ -/* $Id: socket.h,v 1.15 2000/07/08 00:20:43 davem Exp $ */ +/* $Id: socket.h,v 1.16 2001/01/30 07:48:30 davem Exp $ */ #ifndef _ASM_SOCKET_H #define _ASM_SOCKET_H @@ -22,6 +22,7 @@ #define SO_SNDLOWAT 0x1000 #define SO_RCVTIMEO 0x2000 #define SO_SNDTIMEO 0x4000 +#define SO_ACCEPTCONN 0x8000 /* wha!??? */ #define SO_DONTLINGER (~SO_LINGER) /* Older SunOS compat. hack */ diff --git a/include/asm-sparc/termios.h b/include/asm-sparc/termios.h index d92fb867b4b6..9d076f724fd7 100644 --- a/include/asm-sparc/termios.h +++ b/include/asm-sparc/termios.h @@ -66,7 +66,7 @@ struct winsize { #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ #define N_R3964 9 /* Reserved for Simatic R3964 module */ #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ -#define N_IRDA 11 /* Linux IrDa - http://www.cs.uit.no/~dagb/irda/irda.html */ +#define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ #define N_HDLC 13 /* synchronous HDLC */ #define N_SYNC_PPP 14 /* synchronous PPP */ diff --git a/include/asm-sparc64/socket.h b/include/asm-sparc64/socket.h index e28c54a97e79..25d2831af39a 100644 --- a/include/asm-sparc64/socket.h +++ b/include/asm-sparc64/socket.h @@ -1,4 +1,4 @@ -/* $Id: socket.h,v 1.8 2000/07/08 00:20:43 davem Exp $ */ +/* $Id: socket.h,v 1.9 2001/01/30 07:48:30 davem Exp $ */ #ifndef _ASM_SOCKET_H #define _ASM_SOCKET_H @@ -22,6 +22,7 @@ #define SO_SNDLOWAT 0x1000 #define SO_RCVTIMEO 0x2000 #define SO_SNDTIMEO 0x4000 +#define SO_ACCEPTCONN 0x8000 /* wha!??? */ #define SO_DONTLINGER (~SO_LINGER) /* Older SunOS compat. hack */ diff --git a/include/asm-sparc64/termios.h b/include/asm-sparc64/termios.h index 578e0725188f..ebc5dd3ebce5 100644 --- a/include/asm-sparc64/termios.h +++ b/include/asm-sparc64/termios.h @@ -66,7 +66,7 @@ struct winsize { #define N_MASC 8 /* Reserved for Mobitex module <kaz@cafe.net> */ #define N_R3964 9 /* Reserved for Simatic R3964 module */ #define N_PROFIBUS_FDL 10 /* Reserved for Profibus <Dave@mvhi.com> */ -#define N_IRDA 11 /* Linux IrDa - http://www.cs.uit.no/~dagb/irda/irda.html */ +#define N_IRDA 11 /* Linux IrDa - http://irda.sourceforge.net/ */ #define N_SMSBLOCK 12 /* SMS block mode - for talking to GSM data cards about SMS messages */ #define N_HDLC 13 /* synchronous HDLC */ #define N_SYNC_PPP 14 /* synchronous PPP */ diff --git a/include/linux/module.h b/include/linux/module.h index 7f416d7fb9b7..afa2e66f0139 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -249,12 +249,6 @@ static const struct gtype##_id * __module_##gtype##_table \ __attribute__ ((unused)) = name #define MODULE_DEVICE_TABLE(type,name) \ MODULE_GENERIC_TABLE(type##_device,name) -/* not put to .modinfo section to avoid section type conflicts */ - -/* The attributes of a section are set the first time the section is - seen; we want .modinfo to not be allocated. */ - -__asm__(".section .modinfo\n\t.previous"); /* Define the module variable, and usage macros. */ extern struct module __this_module; diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 6eba9d3deb31..1f4fe7ae3ffb 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -141,6 +141,7 @@ #define PCI_DEVICE_ID_COMPAQ_NETEL100PI 0xae43 #define PCI_DEVICE_ID_COMPAQ_NETEL100I 0xb011 #define PCI_DEVICE_ID_COMPAQ_CISS 0xb060 +#define PCI_DEVICE_ID_COMPAQ_CISSB 0xb178 #define PCI_DEVICE_ID_COMPAQ_THUNDER 0xf130 #define PCI_DEVICE_ID_COMPAQ_NETFLEX3B 0xf150 @@ -688,13 +689,23 @@ #define PCI_DEVICE_ID_CERN_HIPPI_DST 0x0021 #define PCI_DEVICE_ID_CERN_HIPPI_SRC 0x0022 -#define PCI_VENDOR_ID_NVIDIA 0x10de -#define PCI_DEVICE_ID_NVIDIA_TNT 0x0020 -#define PCI_DEVICE_ID_NVIDIA_TNT2 0x0028 -#define PCI_DEVICE_ID_NVIDIA_UTNT2 0x0029 -#define PCI_DEVICE_ID_NVIDIA_VTNT2 0x002C -#define PCI_DEVICE_ID_NVIDIA_UVTNT2 0x002D -#define PCI_DEVICE_ID_NVIDIA_ITNT2 0x00A0 +#define PCI_VENDOR_ID_NVIDIA 0x10de +#define PCI_DEVICE_ID_NVIDIA_TNT 0x0020 +#define PCI_DEVICE_ID_NVIDIA_TNT2 0x0028 +#define PCI_DEVICE_ID_NVIDIA_UTNT2 0x0029 +#define PCI_DEVICE_ID_NVIDIA_VTNT2 0x002C +#define PCI_DEVICE_ID_NVIDIA_UVTNT2 0x002D +#define PCI_DEVICE_ID_NVIDIA_ITNT2 0x00A0 +#define PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR 0x0100 +#define PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR 0x0101 +#define PCI_DEVICE_ID_NVIDIA_QUADRO 0x0103 +#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX 0x0110 +#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX2 0x0111 +#define PCI_DEVICE_ID_NVIDIA_QUADRO2_MXR 0x0113 +#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS 0x0150 +#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS2 0x0151 +#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA 0x0152 +#define PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO 0x0153 #define PCI_VENDOR_ID_IMS 0x10e0 #define PCI_DEVICE_ID_IMS_8849 0x8849 diff --git a/include/linux/serial.h b/include/linux/serial.h index 7d4178a542ca..b5ed862a98a1 100644 --- a/include/linux/serial.h +++ b/include/linux/serial.h @@ -139,8 +139,9 @@ struct serial_uart_config { #define ASYNC_CHECK_CD 0x02000000 /* i.e., CLOCAL */ #define ASYNC_SHARE_IRQ 0x01000000 /* for multifunction cards --- no longer used */ +#define ASYNC_NO_FLOW 0x00800000 /* No flow control serial console */ -#define ASYNC_INTERNAL_FLAGS 0xFF000000 /* Internal flags */ +#define ASYNC_INTERNAL_FLAGS 0xFF800000 /* Internal flags */ /* * Multiport serial configuration structure --- external structure @@ -177,5 +178,7 @@ struct serial_icounter_struct { extern int register_serial(struct serial_struct *req); extern void unregister_serial(int line); +/* Allow complicated architectures to specify rs_table[] at run time */ +extern int early_serial_setup(struct serial_struct *req); #endif /* __KERNEL__ */ #endif /* _LINUX_SERIAL_H */ |