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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
linux
/
parport.h
diff --git
a/include/linux/parport.h
b/include/linux/parport.h
index
008d736
..
5bf321e
100644
(file)
--- a/
include/linux/parport.h
+++ b/
include/linux/parport.h
@@
-96,7
+96,6
@@
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>
@@
-128,6
+127,10
@@
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;
@@
-139,6
+142,7
@@
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;