diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:08:56 -0400 |
| commit | 5a89770daad83df74d77a8d34a1ffaedae565ce9 (patch) | |
| tree | 0d8ef70293a6ef969ba8b7718e59608337643d40 /include/linux/quicklist.h | |
| parent | c46c948260f41af18b277c1eb1895d788d3605dc (diff) | |
| parent | af7c951d76708c61b862463d579d76be757130bf (diff) | |
Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
Diffstat (limited to 'include/linux/quicklist.h')
| -rw-r--r-- | include/linux/quicklist.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/quicklist.h b/include/linux/quicklist.h index 39b66713a0bb..bd466439c588 100644 --- a/include/linux/quicklist.h +++ b/include/linux/quicklist.h | |||
| @@ -80,6 +80,13 @@ void quicklist_trim(int nr, void (*dtor)(void *), | |||
| 80 | 80 | ||
| 81 | unsigned long quicklist_total_size(void); | 81 | unsigned long quicklist_total_size(void); |
| 82 | 82 | ||
| 83 | #else | ||
| 84 | |||
| 85 | static inline unsigned long quicklist_total_size(void) | ||
| 86 | { | ||
| 87 | return 0; | ||
| 88 | } | ||
| 89 | |||
| 83 | #endif | 90 | #endif |
| 84 | 91 | ||
| 85 | #endif /* LINUX_QUICKLIST_H */ | 92 | #endif /* LINUX_QUICKLIST_H */ |