Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6

* 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:
  SFI: remove the v0.7 related definitions from sfi.h
This commit is contained in:
Linus Torvalds 2010-10-26 17:27:14 -07:00
commit 7eb901e791

View File

@ -70,9 +70,6 @@
#define SFI_SIG_APIC "APIC"
#define SFI_SIG_XSDT "XSDT"
#define SFI_SIG_WAKE "WAKE"
#define SFI_SIG_SPIB "SPIB"
#define SFI_SIG_I2CB "I2CB"
#define SFI_SIG_GPEM "GPEM"
#define SFI_SIG_DEVS "DEVS"
#define SFI_SIG_GPIO "GPIO"
@ -168,27 +165,6 @@ struct sfi_gpio_table_entry {
char pin_name[16];
} __packed;
struct sfi_spi_table_entry {
u16 host_num; /* attached to host 0, 1...*/
u16 cs; /* chip select */
u16 irq_info;
char name[16];
u8 dev_info[10];
} __packed;
struct sfi_i2c_table_entry {
u16 host_num;
u16 addr; /* slave addr */
u16 irq_info;
char name[16];
u8 dev_info[10];
} __packed;
struct sfi_gpe_table_entry {
u16 logical_id; /* logical id */
u16 phys_id; /* physical GPE id */
} __packed;
typedef int (*sfi_table_handler) (struct sfi_table_header *table);
#ifdef CONFIG_SFI