diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-12-08 12:58:33 +0300 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-12-08 12:59:24 +0300 |
| commit | ec208491936d6adb8a70c3dd4a517cdfe54e823d (patch) | |
| tree | c7291450e8e559c5fbf3360df30999432204af3c /include/linux/moduleparam.h | |
| parent | aa697079ee66315c4b9747a5eb3e48487fb1b8be (diff) | |
| parent | 7b626acb8f983eb83b396ab96cc24b18d635d487 (diff) | |
| download | linux-ec208491936d6adb8a70c3dd4a517cdfe54e823d.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Merge the BIOS workarounds from 2.6.32, and the swiotlb fallback on failure.
Diffstat (limited to 'include/linux/moduleparam.h')
| -rw-r--r-- | include/linux/moduleparam.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index 6547c3cdbc4c..82a9124f7d75 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h @@ -37,7 +37,6 @@ typedef int (*param_set_fn)(const char *val, struct kernel_param *kp); typedef int (*param_get_fn)(char *buffer, struct kernel_param *kp); /* Flag bits for kernel_param.flags */ -#define KPARAM_KMALLOCED 1 #define KPARAM_ISBOOL 2 struct kernel_param { |