diff options
| author | Gabriel de Perthuis <Gabriel.de-Perthuis@laPoste.net> | 2008-08-05 20:05:40 +0200 |
|---|---|---|
| committer | Luis R. Rodriguez <lrodriguez@atheros.com> | 2008-08-05 16:43:06 -0700 |
| commit | 9bf6c94382c3798bd8eaca1029a674e662e48698 (patch) | |
| tree | 07970ee20aeec4468b09cdcfafcf64e720fe420a | |
| parent | b50a641d2a33c228805c8c1b526773fa3635356e (diff) | |
| download | compat-wireless-2.6-old-9bf6c94382c3798bd8eaca1029a674e662e48698.tar.gz | |
Fix incorrect conditional nesting, that prevented inclusion of compat symbols.
Kernels 2.6.23 or above didn't get these symbols:
device_create_vargs
device_create_drvdata
register_rfkill_notifier
unregister_rfkill_notifier
rfkill_force_state
Also fix a related comment typo found checking compat/compat.h .
Signed-off-by: Gabriel de Perthuis <Gabriel.de-Perthuis@laPoste.net>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
| -rw-r--r-- | compat/compat.c | 6 | ||||
| -rw-r--r-- | compat/compat.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compat/compat.c b/compat/compat.c index b1ec4d4..84e3ab3 100644 --- a/compat/compat.c +++ b/compat/compat.c @@ -640,6 +640,8 @@ int pci_try_set_mwi(struct pci_dev *dev) EXPORT_SYMBOL(pci_try_set_mwi); #endif +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)) */ + /* All things not in 2.6.25 */ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)) @@ -744,7 +746,7 @@ struct device *device_create_drvdata(struct class *class, return dev; } EXPORT_SYMBOL_GPL(device_create_drvdata); -#endif +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26) */ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)) @@ -839,5 +841,3 @@ EXPORT_SYMBOL(rfkill_force_state); #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) */ -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)) */ - diff --git a/compat/compat.h b/compat/compat.h index ec50750..75a498e 100644 --- a/compat/compat.h +++ b/compat/compat.h @@ -441,7 +441,7 @@ static inline void set_freezable(void) {} #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) /* Added on 2.6.24 in include/linux/types.h by Al viro on commit 142956af */ typedef unsigned long uintptr_t; -#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)) */ +#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) */ |