diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-02-03 17:12:42 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-02-03 17:13:05 -0500 |
| commit | 972c5ae961d6e5103e2b33d935cfa4145fd47140 (patch) | |
| tree | 350b2a76b979ba8766c09838617df67ff330eca0 /fs/ntfs | |
| parent | 5196d20305d5e30d871111d3a876cf067dd94255 (diff) | |
| parent | 7c7ed8ec337bf5f62cc5287a6eb6b2f1b7504c2f (diff) | |
Merge branch 'master' into for-next
Sync with Linus' tree to be able to apply patch to a newer
code (namely drivers/gpu/drm/gma500/psb_intel_lvds.c)
Diffstat (limited to 'fs/ntfs')
| -rw-r--r-- | fs/ntfs/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index 608be4516091..5a4a8af5c406 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c | |||
| @@ -3198,7 +3198,7 @@ MODULE_DESCRIPTION("NTFS 1.2/3.x driver - Copyright (c) 2001-2011 Anton Altaparm | |||
| 3198 | MODULE_VERSION(NTFS_VERSION); | 3198 | MODULE_VERSION(NTFS_VERSION); |
| 3199 | MODULE_LICENSE("GPL"); | 3199 | MODULE_LICENSE("GPL"); |
| 3200 | #ifdef DEBUG | 3200 | #ifdef DEBUG |
| 3201 | module_param(debug_msgs, bool, 0); | 3201 | module_param(debug_msgs, bint, 0); |
| 3202 | MODULE_PARM_DESC(debug_msgs, "Enable debug messages."); | 3202 | MODULE_PARM_DESC(debug_msgs, "Enable debug messages."); |
| 3203 | #endif | 3203 | #endif |
| 3204 | 3204 | ||