diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-31 12:13:10 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-31 12:13:10 -0400 |
| commit | 7b3b6e42032e94a6132a85642e95106f5346650e (patch) | |
| tree | 8b2262291341d8a9f9b1e7e3c63a3289bb6c6de6 /include/asm-um/mtrr.h | |
| parent | 04172c0b9ea5861e5cba7909da5297b3aedac9e1 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
Merge commit 'v2.6.28-rc2' into topic/asoc
Diffstat (limited to 'include/asm-um/mtrr.h')
| -rw-r--r-- | include/asm-um/mtrr.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-um/mtrr.h b/include/asm-um/mtrr.h deleted file mode 100644 index 5e9cd12c578d..000000000000 --- a/include/asm-um/mtrr.h +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | #ifndef __UM_MTRR_H | ||
| 2 | #define __UM_MTRR_H | ||
| 3 | |||
| 4 | #include "asm/arch/mtrr.h" | ||
| 5 | |||
| 6 | #endif | ||