diff options
| author |   Patrick McHardy <kaber@trash.net> | 2011-01-19 23:51:37 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-01-19 23:51:37 +0100 |
| commit | 14f0290ba44de6ed435fea24bba26e7868421c66 (patch) | |
| tree | 449d32e4848007e3edbcab14fa8e09fdc66608ed /include/linux/toshiba.h | |
| parent | netfilter: nf_conntrack: fix lifetime display for disabled connections (diff) | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-dev-14f0290ba44de6ed435fea24bba26e7868421c66.tar.xz linux-dev-14f0290ba44de6ed435fea24bba26e7868421c66.zip | |
Merge branch 'master' of /repos/git/net-next-2.6
Diffstat (limited to 'include/linux/toshiba.h')
| -rw-r--r-- | include/linux/toshiba.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/toshiba.h b/include/linux/toshiba.h index 6a7c4edf0e13..772dedbc3a22 100644 --- a/include/linux/toshiba.h +++ b/include/linux/toshiba.h @@ -33,6 +33,8 @@ typedef struct { unsigned int edi __attribute__ ((packed)); } SMMRegisters; +#ifdef __KERNEL__ int tosh_smm(SMMRegisters *regs); +#endif /* __KERNEL__ */ #endif |