diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
| commit | 0a1340c185734a57fbf4775927966ad4a1347b02 (patch) | |
| tree | d9ed8f0dd809a7c542a3356601125ea5b5aaa804 /include/asm-mips/ddb5xxx | |
| parent | af18ddb8864b096e3ed4732e2d4b21c956dcfe3a (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
Diffstat (limited to 'include/asm-mips/ddb5xxx')
| -rw-r--r-- | include/asm-mips/ddb5xxx/ddb5477.h | 1 | ||||
| -rw-r--r-- | include/asm-mips/ddb5xxx/ddb5xxx.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-mips/ddb5xxx/ddb5477.h b/include/asm-mips/ddb5xxx/ddb5477.h index a438548e6ef3..c5af4b73fdd7 100644 --- a/include/asm-mips/ddb5xxx/ddb5477.h +++ b/include/asm-mips/ddb5xxx/ddb5477.h | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #ifndef __ASM_DDB5XXX_DDB5477_H | 17 | #ifndef __ASM_DDB5XXX_DDB5477_H |
| 18 | #define __ASM_DDB5XXX_DDB5477_H | 18 | #define __ASM_DDB5XXX_DDB5477_H |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | ||
| 21 | 20 | ||
| 22 | /* | 21 | /* |
| 23 | * This contains macros that are specific to DDB5477 or renamed from | 22 | * This contains macros that are specific to DDB5477 or renamed from |
diff --git a/include/asm-mips/ddb5xxx/ddb5xxx.h b/include/asm-mips/ddb5xxx/ddb5xxx.h index 2f1b191c6fff..e97fcc8d548b 100644 --- a/include/asm-mips/ddb5xxx/ddb5xxx.h +++ b/include/asm-mips/ddb5xxx/ddb5xxx.h | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #ifndef __ASM_DDB5XXX_DDB5XXX_H | 18 | #ifndef __ASM_DDB5XXX_DDB5XXX_H |
| 19 | #define __ASM_DDB5XXX_DDB5XXX_H | 19 | #define __ASM_DDB5XXX_DDB5XXX_H |
| 20 | 20 | ||
| 21 | #include <linux/config.h> | ||
| 22 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 23 | 22 | ||
| 24 | /* | 23 | /* |