Hello,
On Fri, Jul 16, 2010 at 02:45:10PM -0400, Marvin Stodolsky wrote:
> You are correct I expect about there being no significant difference,
> expect that I was updating documentation, when BP complained.
> I was traveling and just packaged what I had on my laptop and sent it to BP.
---end quoted text---
Thanks for the explanation, I suggest adding the attached patch (which
fixes a compile error with kernels >= 2.6.33), it is currently used in
Debian & Ubuntu (development releases).
--
أحمد المحمودي (Ahmed El-Mahmoudy)
Digital design engineer
GPG KeyID: 0xEDDDA1B7
GPG Fingerprint: 8206 A196 2084 7E6D 0DF8 B176 BC19 6A94 EDDD A1B7
Description: Path of utsrelease.h changed to
$(KERNEL_DIR)/generated/utsrelease.h in linux kernel >= 2.6.33
Credits to Harald Jenny <harald@xxxxxxxxxxxxxxxxxxxxx> for the heads up
Forwarded: yes
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@xxxxxxxxxx>
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -82,7 +82,7 @@
$(RM) ${DESTDIR}/dev/slusb$(minor) ; ) echo -n
else
-ifeq ($(shell grep 'UTS.*"2\.6' $(KERNEL_DIR)/include/linux/utsrelease.h $(KERNEL_DIR)/include/linux/version.h 2>/dev/null),)
+ifeq ($(shell grep 'UTS.*"2\.6' $(KERNEL_DIR)/include/generated/utsrelease.h $(KERNEL_DIR)/include/linux/utsrelease.h $(KERNEL_DIR)/include/linux/version.h 2>/dev/null),)
slusb-objs:= old_st7554.o
obj:=.
--- a/drivers/kernel-ver.c
+++ b/drivers/kernel-ver.c
@@ -5,9 +5,13 @@
#include <stdio.h>
#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
+#include <generated/utsrelease.h>
+#else
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
#include <linux/utsrelease.h>
-#endif
+#endif // KERNEL_VERSION(2,6,18)
+#endif // KERNEL_VERSION(2,6,33)
int main()
{
