git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
[pandora-kernel.git]
/
arch
/
arm
/
plat-samsung
/
platformdata.c
diff --git
a/arch/arm/plat-samsung/platformdata.c
b/arch/arm/plat-samsung/platformdata.c
index
6de1a38
..
ceb9fa3
100644
(file)
--- a/
arch/arm/plat-samsung/platformdata.c
+++ b/
arch/arm/plat-samsung/platformdata.c
@@
-10,6
+10,7
@@
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
+#include <linux/slab.h>
#include <linux/string.h>
#include <linux/platform_device.h>
#include <linux/string.h>
#include <linux/platform_device.h>
@@
-50,8
+51,6
@@
void s3c_sdhci_set_platdata(struct s3c_sdhci_platdata *pd,
set->max_width = pd->max_width;
if (pd->cfg_gpio)
set->cfg_gpio = pd->cfg_gpio;
set->max_width = pd->max_width;
if (pd->cfg_gpio)
set->cfg_gpio = pd->cfg_gpio;
- if (pd->cfg_card)
- set->cfg_card = pd->cfg_card;
if (pd->host_caps)
set->host_caps |= pd->host_caps;
if (pd->clk_type)
if (pd->host_caps)
set->host_caps |= pd->host_caps;
if (pd->clk_type)