From 525d5f5bffdb4b4784efd915cca6052653ad47a8 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Mon, 12 Sep 2005 18:49:25 +0200 Subject: [PATCH] --- yaml --- r: 8635 b: refs/heads/master c: c47a3167d0454c0af5fb0a0322b01a0e3487798e h: refs/heads/master i: 8633: 1d411d7c09f1a3c2a95f96f8679571bc9b86ce63 8631: 394f967af5d70ebe7035549e4debd2cc0d7f3a00 v: v3 --- [refs] | 2 +- trunk/include/linux/dmi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e07dd66a5bc5..397ffc0c649a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aeb39986ec8bf31c8d55eba22f0a9996363482fb +refs/heads/master: c47a3167d0454c0af5fb0a0322b01a0e3487798e diff --git a/trunk/include/linux/dmi.h b/trunk/include/linux/dmi.h index c30175e8dec6..a415f1d93e9a 100644 --- a/trunk/include/linux/dmi.h +++ b/trunk/include/linux/dmi.h @@ -70,7 +70,7 @@ extern struct dmi_device * dmi_find_device(int type, const char *name, static inline int dmi_check_system(struct dmi_system_id *list) { return 0; } static inline char * dmi_get_system_info(int field) { return NULL; } -static struct dmi_device * dmi_find_device(int type, const char *name, +static inline struct dmi_device * dmi_find_device(int type, const char *name, struct dmi_device *from) { return NULL; } #endif