diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 15:19:14 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-07-15 15:19:14 -0400 |
| commit | 0c17e4ceedd35c78b1c7413dbd16279a350be6bc (patch) | |
| tree | 313b3b9ca04727f3704464e01d8dd97da1dd534b /drivers/s390/cio/idset.h | |
| parent | 19c1d6a34abf73d0baf8e325d018c920fa78dddc (diff) | |
| parent | b9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-rmk
Diffstat (limited to 'drivers/s390/cio/idset.h')
| -rw-r--r-- | drivers/s390/cio/idset.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/idset.h b/drivers/s390/cio/idset.h index 144466ab8c15..528065cb5021 100644 --- a/drivers/s390/cio/idset.h +++ b/drivers/s390/cio/idset.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #ifndef S390_IDSET_H | 8 | #ifndef S390_IDSET_H |
| 9 | #define S390_IDSET_H S390_IDSET_H | 9 | #define S390_IDSET_H S390_IDSET_H |
| 10 | 10 | ||
| 11 | #include "schid.h" | 11 | #include <asm/schid.h> |
| 12 | 12 | ||
| 13 | struct idset; | 13 | struct idset; |
| 14 | 14 | ||