Remove sys/io.h inclusion from some files that didn't need it, and change
asm/io.h to sys/io.h in vga.c, which newer Linux complains about.
This commit is contained in:
		
							parent
							
								
									d803918a9f
								
							
						
					
					
						commit
						d221c484f9
					
				| 
						 | 
					@ -22,7 +22,6 @@
 | 
				
			||||||
 * PERFORMANCE OF THIS SOFTWARE.
 | 
					 * PERFORMANCE OF THIS SOFTWARE.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
/* $Header$ */
 | 
					/* $Header$ */
 | 
				
			||||||
#include <sys/io.h>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef HAVE_CONFIG_H
 | 
					#ifdef HAVE_CONFIG_H
 | 
				
			||||||
#include <config.h>
 | 
					#include <config.h>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -25,7 +25,6 @@
 | 
				
			||||||
#include <config.h>
 | 
					#include <config.h>
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
#include "mach64.h"
 | 
					#include "mach64.h"
 | 
				
			||||||
#include <sys/io.h>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
static Bool
 | 
					static Bool
 | 
				
			||||||
mach64CardInit (KdCardInfo *card)
 | 
					mach64CardInit (KdCardInfo *card)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -32,7 +32,7 @@
 | 
				
			||||||
#ifdef linux
 | 
					#ifdef linux
 | 
				
			||||||
#ifdef __i386__
 | 
					#ifdef __i386__
 | 
				
			||||||
#define extern static
 | 
					#define extern static
 | 
				
			||||||
#include <asm/io.h>
 | 
					#include <sys/io.h>
 | 
				
			||||||
#undef extern
 | 
					#undef extern
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define _VgaInb(r)	inb(r)
 | 
					#define _VgaInb(r)	inb(r)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue