Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 31096
b: refs/heads/master
c: cf7c712
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Jun 27, 2006
1 parent 00bcf90 commit 89f8969
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e29419fffceb8ec36def3c922040e1ca7bcd3de5
refs/heads/master: cf7c712c11fb881842534efe98a07f36f1c86c65
4 changes: 3 additions & 1 deletion trunk/include/linux/ioport.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@
#define _LINUX_IOPORT_H

#include <linux/compiler.h>
#include <linux/types.h>
/*
* Resources are tree-like, allowing
* nesting etc..
*/
struct resource {
resource_size_t start;
resource_size_t end;
const char *name;
unsigned long start, end;
unsigned long flags;
struct resource *parent, *sibling, *child;
};
Expand Down
2 changes: 2 additions & 0 deletions trunk/include/linux/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ typedef __u64 __bitwise __be64;

#ifdef __KERNEL__
typedef unsigned __bitwise__ gfp_t;

typedef unsigned long resource_size_t;
#endif

struct ustat {
Expand Down

0 comments on commit 89f8969

Please sign in to comment.