Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdac1c76 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

Merge branch 'for-linus' into for-next

parents 03682411 d8788298

drivers/ide/icside.c

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) 
	struct ide_host *host;

	unsigned int sel = 0;

	int ret;

	hw_regs_t hw[2], *hws[] = { &hw[0], NULL, NULL, NULL };

	hw_regs_t hw[2], *hws[] = { &hw[0], &hw[1], NULL, NULL };

	struct ide_port_info d = icside_v6_port_info;



	ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);

drivers/ide/piix.c

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ static const struct ich_laptop ich_laptop[] = { 
	{ 0x24CA, 0x1025, 0x003d },	/* ICH4 on ACER TM290 */

	{ 0x266F, 0x1025, 0x0066 },	/* ICH6 on ACER Aspire 1694WLMi */

	{ 0x2653, 0x1043, 0x82D8 },	/* ICH6M on Asus Eee 701 */

	{ 0x27df, 0x104d, 0x900e },	/* ICH7 on Sony TZ-90 */

	/* end marker */

	{ 0, }

};