diff options
| author | Eric Sandall | 2007-10-20 20:05:48 -0700 |
|---|---|---|
| committer | Eric Sandall | 2007-10-20 20:05:48 -0700 |
| commit | a3dacdccb9f2530e68de1de9f467d547725e77ee (patch) | |
| tree | 6b1b6ab52cc4a70faab687578a1a9b80fca7ddb3 | |
| parent | bc33c222e25fd322976db9c04d64f606653fd1de (diff) | |
iwlwifi: Make that 2.6.23, as that's what I tested with
| -rwxr-xr-x | kernels/iwlwifi/CONFLICTS | 2 | ||||
| -rwxr-xr-x | kernels/iwlwifi/DEPENDS | 2 | ||||
| -rw-r--r-- | kernels/iwlwifi/HISTORY | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kernels/iwlwifi/CONFLICTS b/kernels/iwlwifi/CONFLICTS index 9540df38a4..900a55288e 100755 --- a/kernels/iwlwifi/CONFLICTS +++ b/kernels/iwlwifi/CONFLICTS @@ -1,6 +1,6 @@ source $GRIMOIRE/FUNCTIONS && -if [[ "$(get_kernel_version|cut -d. -f3)" < "22" ]] +if [[ "$(get_kernel_version|cut -d. -f3)" < "23" ]] then conflicts mac80211 fi diff --git a/kernels/iwlwifi/DEPENDS b/kernels/iwlwifi/DEPENDS index 419d177ea9..4c492ea554 100755 --- a/kernels/iwlwifi/DEPENDS +++ b/kernels/iwlwifi/DEPENDS @@ -2,7 +2,7 @@ depends IWLWIFI-UCODE '' '' 'z-rejected' && source $GRIMOIRE/FUNCTIONS && -if [[ "$(get_kernel_version|cut -d. -f3)" < "22" ]] +if [[ "$(get_kernel_version|cut -d. -f3)" < "23" ]] then depends mac80211 fi diff --git a/kernels/iwlwifi/HISTORY b/kernels/iwlwifi/HISTORY index f99e0dd4f8..c69c077eb7 100644 --- a/kernels/iwlwifi/HISTORY +++ b/kernels/iwlwifi/HISTORY @@ -1,6 +1,6 @@ 2007-10-20 Eric Sandall <sandalle@sourcemage.org> - * DEPENDS: Only needs mac80211 for 2.6.21 and older - * CONFLICTS: Conflicts with mac80211 for 2.6.22 and newer, since it's + * DEPENDS: Only needs mac80211 for 2.6.22 and older + * CONFLICTS: Conflicts with mac80211 for 2.6.23 and newer, since it's now in the kernel * PRE_BUILD: Check for CONFIG_FW_LOADER and CONFIG_MAC80211 |