git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
include
/
linux
/
parport.h
diff --git
a/include/linux/parport.h
b/include/linux/parport.h
index
5bf321e
..
008d736
100644
(file)
--- a/
include/linux/parport.h
+++ b/
include/linux/parport.h
@@
-96,6
+96,7
@@
typedef enum {
/* The rest is for the kernel only */
#ifdef __KERNEL__
/* The rest is for the kernel only */
#ifdef __KERNEL__
+#include <linux/config.h>
#include <linux/jiffies.h>
#include <linux/proc_fs.h>
#include <linux/spinlock.h>
#include <linux/jiffies.h>
#include <linux/proc_fs.h>
#include <linux/spinlock.h>
@@
-127,10
+128,6
@@
struct amiga_parport_state {
unsigned char statusdir;/* ciab.ddrb & 7 */
};
unsigned char statusdir;/* ciab.ddrb & 7 */
};
-struct ax88796_parport_state {
- unsigned char cpr;
-};
-
struct ip32_parport_state {
unsigned int dcr;
unsigned int ecr;
struct ip32_parport_state {
unsigned int dcr;
unsigned int ecr;
@@
-142,7
+139,6
@@
struct parport_state {
/* ARC has no state. */
struct ax_parport_state ax;
struct amiga_parport_state amiga;
/* ARC has no state. */
struct ax_parport_state ax;
struct amiga_parport_state amiga;
- struct ax88796_parport_state ax88796;
/* Atari has not state. */
struct ip32_parport_state ip32;
void *misc;
/* Atari has not state. */
struct ip32_parport_state ip32;
void *misc;