Commit a38219fa authored by Tony Lindgren's avatar Tony Lindgren

Merge with /home/tmlind/src/kernel/linux-omap-2.6

parents 8fd7132d d1140bbe
...@@ -696,7 +696,7 @@ static int dsp_drv_remove(struct device *dev) ...@@ -696,7 +696,7 @@ static int dsp_drv_remove(struct device *dev)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int dsp_drv_suspend(struct device *dev, u32 state, u32 level) static int dsp_drv_suspend(struct device *dev, pm_message_t state, u32 level)
{ {
switch(level) { switch(level) {
case SUSPEND_NOTIFY: case SUSPEND_NOTIFY:
......
...@@ -1565,7 +1565,8 @@ static ssize_t exmap_show(struct device *dev, struct device_attribute *attr, ...@@ -1565,7 +1565,8 @@ static ssize_t exmap_show(struct device *dev, struct device_attribute *attr,
static struct device_attribute dev_attr_exmap = __ATTR_RO(exmap); static struct device_attribute dev_attr_exmap = __ATTR_RO(exmap);
static ssize_t kmem_pool_show(struct device *dev, char *buf) static ssize_t kmem_pool_show(struct device *dev,
struct device_attribute *attr, char *buf)
{ {
int count_1M, count_64K, total; int count_1M, count_64K, total;
......
...@@ -42,10 +42,8 @@ void __init omap_detect_sram(void) ...@@ -42,10 +42,8 @@ void __init omap_detect_sram(void)
omap_sram_base = OMAP1_SRAM_BASE; omap_sram_base = OMAP1_SRAM_BASE;
if (cpu_is_omap730()) if (cpu_is_omap730())
omap_sram_size = 0x30000;
else if (cpu_is_omap730())
omap_sram_size = 0x32000; omap_sram_size = 0x32000;
else if (cpu_is_omap1510()) else if (cpu_is_omap15xx())
omap_sram_size = 0x30000; omap_sram_size = 0x30000;
else if (cpu_is_omap1610() || cpu_is_omap1621() || cpu_is_omap1710()) else if (cpu_is_omap1610() || cpu_is_omap1621() || cpu_is_omap1710())
omap_sram_size = 0x4000; omap_sram_size = 0x4000;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment