diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-06-02 08:15:10 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-06-02 08:15:10 -0400 |
| commit | e4caa8bab3862a7694ab7c6dfede223227ad7fc5 (patch) | |
| tree | 9fa537a72f00f6b4f86c2da7be2e9554304a8ec4 /include/linux/init.h | |
| parent | 9f75c1b12c5ef392ddcea575b13560842c28b1b3 (diff) | |
| parent | edb39935c8b19fcd9a8f619d0bc1e9d04594cd2b (diff) | |
Merge branch 'master' of git.alsa-project.org:alsa-kernel into fix/hda
Diffstat (limited to 'include/linux/init.h')
| -rw-r--r-- | include/linux/init.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index ab1d31f9352b..de994304e0bb 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
| @@ -301,7 +301,7 @@ void __init parse_early_options(char *cmdline); | |||
| 301 | #endif | 301 | #endif |
| 302 | 302 | ||
| 303 | /* Data marked not to be saved by software suspend */ | 303 | /* Data marked not to be saved by software suspend */ |
| 304 | #define __nosavedata __section(.data.nosave) | 304 | #define __nosavedata __section(.data..nosave) |
| 305 | 305 | ||
| 306 | /* This means "can be init if no module support, otherwise module load | 306 | /* This means "can be init if no module support, otherwise module load |
| 307 | may call it." */ | 307 | may call it." */ |