diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 14:46:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 14:46:45 -0400 |
| commit | d613839ef987d20f7c9347732b452efd921b97d9 (patch) | |
| tree | 5998f460596d8dca129d0f116add8f9abddfad38 /mm/highmem.c | |
| parent | 609106b9ac968adbc76ce78c979fc3903a56e16c (diff) | |
| parent | e212d6f25084e8e9b02a04ba514d7bb1e4a4924a (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: remove some includings of blktrace_api.h
mg_disk: seperate mg_disk.h again
block: Introduce helper to reset queue limits to default values
cfq: remove extraneous '\n' in blktrace output
ubifs: register backing_dev_info
btrfs: properly register fs backing device
block: don't overwrite bdi->state after bdi_init() has been run
cfq: cleanup for last_end_request in cfq_data
Diffstat (limited to 'mm/highmem.c')
| -rw-r--r-- | mm/highmem.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/highmem.c b/mm/highmem.c index 68eb1d9b63fa..25878cc49daa 100644 --- a/mm/highmem.c +++ b/mm/highmem.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 27 | #include <linux/hash.h> | 27 | #include <linux/hash.h> |
| 28 | #include <linux/highmem.h> | 28 | #include <linux/highmem.h> |
| 29 | #include <linux/blktrace_api.h> | ||
| 30 | #include <asm/tlbflush.h> | 29 | #include <asm/tlbflush.h> |
| 31 | 30 | ||
| 32 | /* | 31 | /* |