diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
| commit | 70ac4385a13f78bc478f26d317511893741b05bd (patch) | |
| tree | dafc7f3018295fc4ee00339889e4f35d5b9d7743 /include/asm-frv/segment.h | |
| parent | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (diff) | |
| parent | 077e98945db7e54a9865b5f29a1f02f531eca414 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
include/linux/nfs_fs.h
Fixed up conflict with kernel header updates.
Diffstat (limited to 'include/asm-frv/segment.h')
| -rw-r--r-- | include/asm-frv/segment.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-frv/segment.h b/include/asm-frv/segment.h index 61222f00dfc1..e3616a6f941d 100644 --- a/include/asm-frv/segment.h +++ b/include/asm-frv/segment.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #ifndef _ASM_SEGMENT_H | 12 | #ifndef _ASM_SEGMENT_H |
| 13 | #define _ASM_SEGMENT_H | 13 | #define _ASM_SEGMENT_H |
| 14 | 14 | ||
| 15 | #include <linux/config.h> | ||
| 16 | 15 | ||
| 17 | #ifndef __ASSEMBLY__ | 16 | #ifndef __ASSEMBLY__ |
| 18 | 17 | ||