diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-03 13:39:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-03 13:39:02 -0400 |
| commit | 7e31aa11fc672bbe0dd0da59513c9efe3809ced7 (patch) | |
| tree | 0aafe6a0045230950ce6b26579a053da12614a49 /include/asm-arm/segment.h | |
| parent | 071f4924844c435a3ae0cdbab7d7df2f1da85713 (diff) | |
| parent | 9cb7117fa4858468014f76bd996076985111e955 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5182/1: pxa: Fix pcm990 compilation
[ARM] Fix explicit asm(-arm)?/arch-foo references
[ARM] move include/asm-arm to arch/arm/include/asm
[ARM] Remove explicit dependency for misc.o from compressed/Makefile
[ARM] initrd: claim initrd memory exclusively
[ARM] pxa: add support for L2 outer cache on XScale3 (attempt 2)
[ARM] 5180/1: at91: Fix at91_nand -> atmel_nand rename fallout
[ARM] add Sascha Hauer as Freescale i.MX Maintainer
[ARM] i.MX: add missing clock functions exports
[ARM] i.MX: remove set_imx_fb_info() export
[ARM] mx1ads: make mmc platform data available for modules
[ARM] mx2: add missing Kconfig dependency
Diffstat (limited to 'include/asm-arm/segment.h')
| -rw-r--r-- | include/asm-arm/segment.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/asm-arm/segment.h b/include/asm-arm/segment.h deleted file mode 100644 index 9e24c21f630..00000000000 --- a/include/asm-arm/segment.h +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | #ifndef __ASM_ARM_SEGMENT_H | ||
| 2 | #define __ASM_ARM_SEGMENT_H | ||
| 3 | |||
| 4 | #define __KERNEL_CS 0x0 | ||
| 5 | #define __KERNEL_DS 0x0 | ||
| 6 | |||
| 7 | #define __USER_CS 0x1 | ||
| 8 | #define __USER_DS 0x1 | ||
| 9 | |||
| 10 | #endif /* __ASM_ARM_SEGMENT_H */ | ||
| 11 | |||