chromeos/compat-wireless/include/linux/compat-2.6.25.h - Issue 5326002: Update compat-wireless to 2.6.36-5-spn

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/compat-wireless/include/linux/compat-2.6.25.h

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master

Patch Set: Created 10 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chromeos/compat-wireless/include/linux/compat-2.6.25.h

diff --git a/chromeos/compat-wireless/include/linux/compat-2.6.25.h b/chromeos/compat-wireless/include/linux/compat-2.6.25.h

index 8d329b33c0385e3f4e57f6c249170c0ebdc5d9d5..ad3220a7521c4a704d41048a2b49e5e99a64c1bf 100644

--- a/chromeos/compat-wireless/include/linux/compat-2.6.25.h

+++ b/chromeos/compat-wireless/include/linux/compat-2.6.25.h

@@ -58,7 +58,9 @@ int compat_pm_qos_power_deinit(void);

* 2.6.25 adds PM_EVENT_HIBERNATE as well here but

* we don't have this on <= 2.6.23)

+#ifndef PM_EVENT_SLEEP /* some distribution have mucked with their own headers to add this.. */

#define PM_EVENT_SLEEP (PM_EVENT_SUSPEND)

+#endif

/* Although we don't care about wimax this is needed for rfkill input stuff */

#define KEY_WIMAX 246