diff options
| author | Stephen Rothwell <sfr@elm.ozlabs.ibm.com> | 2008-09-13 07:34:48 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@elm.ozlabs.ibm.com> | 2008-09-13 07:50:14 +1000 |
| commit | 1a2d155914faed81120026cbfdbc2c6ca9a0eedc (patch) | |
| tree | e1dc9a0e5fc5875ce278266ec65e9c4ee4ed6b1f /include | |
| parent | f90734c3cf478228aeeae46c288e1dfa53a55c7e (diff) | |
| parent | a09ee8d8b81f8eb8700bce919de413eb89f4d625 (diff) | |
Merge branch 'quilt/rr'
Conflicts:
kernel/module.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/module.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 5d2970cdce93..eddf27db442b 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -277,7 +277,7 @@ struct module /* Exception table */ unsigned int num_exentries; - const struct exception_table_entry *extable; + struct exception_table_entry *extable; /* Startup function. */ int (*init)(void); |