From 933156abbeae7c374c4a5e125be9b592605d32b1 Mon Sep 17 00:00:00 2001 From: Dominik Brodowski Date: Tue, 30 Mar 2010 18:23:24 +0200 Subject: [PATCH] --- yaml --- r: 192525 b: refs/heads/master c: 378b451ede192163780bb15b1ad0a913aa8ee4ae h: refs/heads/master i: 192523: 3b05ce134486198121ee7f9edab626f6f7f72fea v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/yenta_socket.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index d2d4201e825d..bdcbc93c178f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 059f667d9f81082e94dead14ff3fa7b3b42c98a0 +refs/heads/master: 378b451ede192163780bb15b1ad0a913aa8ee4ae diff --git a/trunk/drivers/pcmcia/yenta_socket.c b/trunk/drivers/pcmcia/yenta_socket.c index 83ace277426c..424e576f3acb 100644 --- a/trunk/drivers/pcmcia/yenta_socket.c +++ b/trunk/drivers/pcmcia/yenta_socket.c @@ -1303,13 +1303,6 @@ static int yenta_dev_suspend_noirq(struct device *dev) pci_read_config_dword(pdev, 17*4, &socket->saved_state[1]); pci_disable_device(pdev); - /* - * Some laptops (IBM T22) do not like us putting the Cardbus - * bridge into D3. At a guess, some other laptop will - * probably require this, so leave it commented out for now. - */ - /* pci_set_power_state(dev, 3); */ - return 0; }